Switch network-service to default on

Task-number: QTBUG-79890
Task-number: QTBUG-81556
Task-number: QTBUG-81557
Task-number: QTBUG-81614
Change-Id: I4c81ca1b1fb9c9595c1f670706948fcbe65bcd33
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 5 insertions, 5 deletions

diff --git a/src/core/profile_io_data_qt.cpp b/src/core/profile_io_data_qt.cpp
index 2d0481978..aaaeb277b 100644
--- a/src/core/profile_io_data_qt.cpp
+++ b/src/core/profile_io_data_qt.cpp
@@ -854,6 +854,8 @@ void ProfileIODataQt::CreateRestrictedCookieManager(network::mojom::RestrictedCo
 
 network::mojom::NetworkContextParamsPtr ProfileIODataQt::CreateNetworkContextParams()
 {
+    updateStorageSettings();
+
     network::mojom::NetworkContextParamsPtr network_context_params =
              SystemNetworkContextManager::GetInstance()->CreateDefaultNetworkContextParams();
 
@@ -886,8 +888,6 @@ network::mojom::NetworkContextParamsPtr ProfileIODataQt::CreateNetworkContextPar
     network_context_params->enable_ftp_url_support = true;
 #endif  // !BUILDFLAG(DISABLE_FTP_SUPPORT)
 
-//    proxy_config_monitor_.AddToNetworkContextParams(network_context_params.get());
-
 //    network_context_params->enable_certificate_reporting = true;
 //    network_context_params->enable_expect_ct_reporting = true;
     network_context_params->enforce_chrome_ct_policy = false;
@@ -899,7 +899,7 @@ network::mojom::NetworkContextParamsPtr ProfileIODataQt::CreateNetworkContextPar
             m_profile->GetSharedCorsOriginAccessList()->GetOriginAccessList().CreateCorsOriginAccessPatternsList();
     }
 
-    m_proxyConfigMonitor->AddToNetworkContextParams(&*network_context_params);
+    m_proxyConfigMonitor->AddToNetworkContextParams(network_context_params.get());
 
     return network_context_params;
 }
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index e84844fdb..08e7f2b41 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -541,8 +541,8 @@ WebEngineContext::WebEngineContext()
     appendToFeatureList(disableFeatures, features::kMojoVideoCapture.name);
 
     // We do not yet fully support the network-service, but it has been enabled by default since 75.
-    bool enableNetworkService  = parsedCommandLine->HasSwitch("enable-network-service");
-    parsedCommandLine->RemoveSwitch("enable-network-service");
+    bool enableNetworkService  = !parsedCommandLine->HasSwitch("disable-network-service");
+    parsedCommandLine->RemoveSwitch("disable-network-service");
     if (!enableNetworkService)
         appendToFeatureList(disableFeatures, network::features::kNetworkService.name);