Delete last network service feature checks

Network service is required.

Task-number: QTBUG-83394
Change-Id: I8b636730eba5bd2ba5895e072e134c3b1fb786d1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

5 files changed, 0 insertions, 45 deletions

diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index 2c5ba36c8..22dbc173b 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -1058,9 +1058,6 @@ network::mojom::NetworkContext *ContentBrowserClientQt::GetSystemNetworkContext(
 
 void ContentBrowserClientQt::OnNetworkServiceCreated(network::mojom::NetworkService *network_service)
 {
-    if (!base::FeatureList::IsEnabled(network::features::kNetworkService))
-        return;
-
     if (!SystemNetworkContextManager::GetInstance())
         SystemNetworkContextManager::CreateInstance();
 
@@ -1096,7 +1093,6 @@ std::vector<base::FilePath> ContentBrowserClientQt::GetNetworkContextsParentDire
 void ContentBrowserClientQt::RegisterNonNetworkNavigationURLLoaderFactories(int frame_tree_node_id,
                                                                             NonNetworkURLLoaderFactoryMap *factories)
 {
-    DCHECK(base::FeatureList::IsEnabled(network::features::kNetworkService));
     content::WebContents *web_contents = content::WebContents::FromFrameTreeNodeId(frame_tree_node_id);
     Profile *profile = Profile::FromBrowserContext(web_contents->GetBrowserContext());
     ProfileAdapter *profileAdapter = static_cast<ProfileQt *>(profile)->profileAdapter();
@@ -1115,7 +1111,6 @@ void ContentBrowserClientQt::RegisterNonNetworkNavigationURLLoaderFactories(int
 void ContentBrowserClientQt::RegisterNonNetworkWorkerMainResourceURLLoaderFactories(content::BrowserContext *browser_context,
                                                                                     NonNetworkURLLoaderFactoryMap *factories)
 {
-    DCHECK(base::FeatureList::IsEnabled(network::features::kNetworkService));
     Profile *profile = Profile::FromBrowserContext(browser_context);
     ProfileAdapter *profileAdapter = static_cast<ProfileQt *>(profile)->profileAdapter();
 
@@ -1126,8 +1121,6 @@ void ContentBrowserClientQt::RegisterNonNetworkWorkerMainResourceURLLoaderFactor
 void ContentBrowserClientQt::RegisterNonNetworkSubresourceURLLoaderFactories(int render_process_id, int render_frame_id,
                                                                              NonNetworkURLLoaderFactoryMap *factories)
 {
-    if (!base::FeatureList::IsEnabled(network::features::kNetworkService))
-        return;
     content::RenderProcessHost *process_host = content::RenderProcessHost::FromID(render_process_id);
     Profile *profile = Profile::FromBrowserContext(process_host->GetBrowserContext());
     ProfileAdapter *profileAdapter = static_cast<ProfileQt *>(profile)->profileAdapter();
@@ -1212,9 +1205,6 @@ bool ContentBrowserClientQt::WillCreateURLLoaderFactory(
         bool *bypass_redirect_checks,
         network::mojom::URLLoaderFactoryOverridePtr *factory_override)
 {
-    if (!base::FeatureList::IsEnabled(network::features::kNetworkService))
-        return false;
-
     auto proxied_receiver = std::move(*factory_receiver);
     network::mojom::URLLoaderFactoryPtrInfo target_factory_info;
     *factory_receiver = mojo::MakeRequest(&target_factory_info);
diff --git a/src/core/login_delegate_qt.cpp b/src/core/login_delegate_qt.cpp
index 1b9c22191..7942c8279 100644
--- a/src/core/login_delegate_qt.cpp
+++ b/src/core/login_delegate_qt.cpp
@@ -87,11 +87,6 @@ LoginDelegateQt::LoginDelegateQt(const net::AuthChallengeInfo &authInfo,
             base::BindOnce(&LoginDelegateQt::triggerDialog, m_weakFactory.GetWeakPtr()));
 }
 
-LoginDelegateQt::~LoginDelegateQt()
-{
-    destroy();
-}
-
 QUrl LoginDelegateQt::url() const
 {
     return toQt(m_url);
@@ -152,16 +147,6 @@ void LoginDelegateQt::sendAuthToRequester(bool success, const QString &user, con
         else
             std::move(m_auth_required_callback).Run(base::nullopt);
     }
-
-    // With network service the auth callback has already deleted us.
-    if (!base::FeatureList::IsEnabled(network::features::kNetworkService))
-        destroy();
-}
-
-void LoginDelegateQt::destroy()
-{
-    m_dialogController.reset();
-    m_auth_required_callback.Reset();
 }
 
 } // namespace QtWebEngineCore
diff --git a/src/core/login_delegate_qt.h b/src/core/login_delegate_qt.h
index 116fe3c56..7b8d869e1 100644
--- a/src/core/login_delegate_qt.h
+++ b/src/core/login_delegate_qt.h
@@ -66,8 +66,6 @@ public:
                     bool first_auth_attempt,
                     LoginAuthRequiredCallback auth_required_callback);
 
-    ~LoginDelegateQt() override;
-
     QUrl url() const;
     QString realm() const;
     QString host() const;
@@ -78,7 +76,6 @@ public:
 
 private:
     void triggerDialog();
-    void destroy();
 
     net::AuthChallengeInfo m_authInfo;
 
diff --git a/src/core/net/system_network_context_manager.cpp b/src/core/net/system_network_context_manager.cpp
index bc42a684d..43b2b2557 100644
--- a/src/core/net/system_network_context_manager.cpp
+++ b/src/core/net/system_network_context_manager.cpp
@@ -166,12 +166,6 @@ private:
 
 network::mojom::NetworkContext *SystemNetworkContextManager::GetContext()
 {
-    if (!base::FeatureList::IsEnabled(network::features::kNetworkService)) {
-        // SetUp should already have been called.
-        DCHECK(io_thread_network_context_);
-        return io_thread_network_context_.get();
-    }
-
     if (!network_service_network_context_ || network_service_network_context_.encountered_error()) {
         // This should call into OnNetworkServiceCreated(), which will re-create
         // the network service, if needed. There's a chance that it won't be
@@ -211,10 +205,6 @@ void SystemNetworkContextManager::SetUp(
         network::mojom::HttpAuthStaticParamsPtr *http_auth_static_params,
         network::mojom::HttpAuthDynamicParamsPtr *http_auth_dynamic_params, bool *is_quic_allowed)
 {
-    if (!base::FeatureList::IsEnabled(network::features::kNetworkService)) {
-        *network_context_request = mojo::MakeRequest(&io_thread_network_context_);
-        *network_context_params = CreateNetworkContextParams();
-    }
     *is_quic_allowed = false;
     *http_auth_static_params = CreateHttpAuthStaticParams();
     *http_auth_dynamic_params = CreateHttpAuthDynamicParams();
@@ -254,8 +244,6 @@ SystemNetworkContextManager::~SystemNetworkContextManager()
 
 void SystemNetworkContextManager::OnNetworkServiceCreated(network::mojom::NetworkService *network_service)
 {
-    if (!base::FeatureList::IsEnabled(network::features::kNetworkService))
-        return;
     // Disable QUIC globally
     network_service->DisableQuic();
 
diff --git a/src/core/net/system_network_context_manager.h b/src/core/net/system_network_context_manager.h
index 288af5195..e429453a2 100644
--- a/src/core/net/system_network_context_manager.h
+++ b/src/core/net/system_network_context_manager.h
@@ -169,11 +169,6 @@ private:
     // enabled. nullptr, otherwise.
     network::mojom::NetworkContextPtr network_service_network_context_;
 
-    // This is a NetworkContext that wraps the IOThread's SystemURLRequestContext.
-    // Always initialized in SetUp, but it's only returned by Context() when the
-    // network service is disabled.
-    network::mojom::NetworkContextPtr io_thread_network_context_;
-
     // URLLoaderFactory backed by the NetworkContext returned by GetContext(), so
     // consumers don't all need to create their own factory.
     scoped_refptr<URLLoaderFactoryForSystem> shared_url_loader_factory_;