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>

2 files changed, 0 insertions, 17 deletions

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_;