Don't call WillCreateURLLoaderFactory when network service is disabled.

One of the callsites, for browser-initiated requests, was calling it.

Change-Id: Ifa9ffa30e0961b10fba1200fc6c79d5bb304b234
Reviewed-on: https://chromium-review.googlesource.com/1187136Reviewed-by: Ken Rockot <rockot@chromium.org>
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585942}

chrome/browser/chrome_content_browser_client.cc

@@ -4456,6 +4456,7 @@ bool ChromeContentBrowserClient::WillCreateURLLoaderFactory(
     content::RenderFrameHost* frame,
     bool is_navigation,
     network::mojom::URLLoaderFactoryRequest* factory_request) {
+  DCHECK(base::FeatureList::IsEnabled(network::features::kNetworkService));
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   auto* web_request_api =
       extensions::BrowserContextKeyedAPIFactory<extensions::WebRequestAPI>::Get(

content/browser/frame_host/render_frame_host_impl.cc

@@ -860,9 +860,14 @@ bool RenderFrameHostImpl::CreateNetworkServiceDefaultFactory(
   SiteIsolationPolicy::PopulateURLLoaderFactoryParamsPtrForCORB(params.get());
 
   auto* context = GetSiteInstance()->GetBrowserContext();
-  bool bypass_redirect_checks =
-      GetContentClient()->browser()->WillCreateURLLoaderFactory(
-          context, this, false /* is_navigation */, &default_factory_request);
+  bool bypass_redirect_checks = false;
+
+  if (base::FeatureList::IsEnabled(network::features::kNetworkService)) {
+    bypass_redirect_checks =
+        GetContentClient()->browser()->WillCreateURLLoaderFactory(
+            context, this, false /* is_navigation */, &default_factory_request);
+  }
+
   // Keep DevTools proxy lasy, i.e. closest to the network.
   RenderFrameDevToolsAgentHost::WillCreateURLLoaderFactory(
       this, false /* is_navigation */, false /* is_download */,

content/browser/storage_partition_impl.cc

@@ -1304,8 +1304,11 @@ StoragePartitionImpl::GetURLLoaderFactoryForBrowserProcessInternal() {
           switches::kDisableWebSecurity);
   if (g_url_loader_factory_callback_for_test.Get().is_null()) {
     auto request = mojo::MakeRequest(&url_loader_factory_for_browser_process_);
-    GetContentClient()->browser()->WillCreateURLLoaderFactory(
-        browser_context(), nullptr, false /* is_navigation */, &request);
+
+    if (base::FeatureList::IsEnabled(network::features::kNetworkService)) {
+      GetContentClient()->browser()->WillCreateURLLoaderFactory(
+          browser_context(), nullptr, false /* is_navigation */, &request);
+    }
     GetNetworkContext()->CreateURLLoaderFactory(std::move(request),
                                                 std::move(params));
     is_test_url_loader_factory_for_browser_process_ = false;

content/public/browser/content_browser_client.h

@@ -1138,6 +1138,8 @@ class CONTENT_EXPORT ContentBrowserClient {
   // Note that |frame| may be null if this is a browser-initiated,
   // non-navigation request, e.g. a request made via
   // |StoragePartition::GetURLLoaderFactoryForBrowserProcess()|.
+  //
+  // This is only called when the network service is enabled.
   virtual bool WillCreateURLLoaderFactory(
       BrowserContext* browser_context,
       RenderFrameHost* frame,