Add support in the network service for different contexts.

content/browser/loader/navigation_url_loader_network_service.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/loader/navigation_url_loader_network_service.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "base/lazy_instance.h"
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
 #include "content/browser/appcache/appcache_navigation_handle.h"
 #include "content/browser/appcache/appcache_navigation_handle_core.h"
 #include "content/browser/appcache/appcache_request_handler.h"
 #include "content/browser/blob_storage/chrome_blob_storage_context.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/navigation_request_info.h"
 #include "content/browser/loader/navigation_resource_handler.h"
 #include "content/browser/loader/navigation_resource_throttle.h"
 #include "content/browser/loader/navigation_url_loader_delegate.h"
 #include "content/browser/resource_context_impl.h"
 #include "content/browser/service_worker/service_worker_navigation_handle.h"
 #include "content/browser/service_worker/service_worker_navigation_handle_core.h"
 #include "content/browser/service_worker/service_worker_request_handler.h"
+#include "content/browser/storage_partition_impl.h"
+#include "content/browser/url_loader_factory_getter.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/browser/webui/url_data_manager_backend.h"
 #include "content/browser/webui/web_ui_url_loader_factory.h"
+#include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/navigation_data.h"
 #include "content/public/browser/navigation_ui_data.h"
 #include "content/public/browser/ssl_status.h"
 #include "content/public/browser/stream_handle.h"
 #include "content/public/common/referrer.h"
-#include "content/public/common/service_manager_connection.h"
-#include "content/public/common/service_names.mojom.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_context.h"
-#include "services/service_manager/public/cpp/connector.h"
 
 namespace content {
 
 namespace {
 
-static base::LazyInstance<mojom::URLLoaderFactoryPtr>::Leaky
-    g_url_loader_factory;
-#if DCHECK_IS_ON()
-static bool g_url_loader_factory_retrieved;
-#endif  // DCHECK_IS_ON()
-
 WebContents* GetWebContentsFromFrameTreeNodeID(int frame_tree_node_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   FrameTreeNode* frame_tree_node =
       FrameTreeNode::GloballyFindByID(frame_tree_node_id);
   if (!frame_tree_node)
     return nullptr;
 
   return WebContentsImpl::FromFrameTreeNode(frame_tree_node);
 }
 
 void PrepareNavigationStartOnIO(
     std::unique_ptr<ResourceRequest> resource_request,
     ResourceContext* resource_context,
     ServiceWorkerNavigationHandleCore* service_worker_navigation_handle_core,
     AppCacheNavigationHandleCore* appcache_handle_core,
     NavigationRequestInfo* request_info,
     mojom::URLLoaderFactoryPtrInfo factory_from_ui,
+    scoped_refptr<URLLoaderFactoryGetter> url_loader_factory_getter,
     const base::Callback<WebContents*(void)>& web_contents_getter,
     mojom::URLLoaderAssociatedRequest url_loader_request,
     mojom::URLLoaderClientPtr url_loader_client_to_pass,
     std::unique_ptr<service_manager::Connector> connector) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   const ResourceType resource_type = request_info->is_main_frame
                                          ? RESOURCE_TYPE_MAIN_FRAME
                                          : RESOURCE_TYPE_SUB_FRAME;
 
@@ skipping 37 matching lines @@
   // If we haven't gotten one from the above, then use the one the UI thread
   // gave us, or otherwise fallback to the default.
   mojom::URLLoaderFactory* factory;
   if (url_loader_factory_ptr) {
     factory = url_loader_factory_ptr.get();
   } else {
     if (factory_from_ui.is_valid()) {
       url_loader_factory_ptr.Bind(std::move(factory_from_ui));
       factory = url_loader_factory_ptr.get();
     } else {
-      if (!g_url_loader_factory.Get()) {
-#if DCHECK_IS_ON()
-        DCHECK(!g_url_loader_factory_retrieved);
-#endif  // DCHECK_IS_ON()
-        connector->BindInterface(mojom::kNetworkServiceName,
-                                 &g_url_loader_factory.Get());
-#if DCHECK_IS_ON()
-        g_url_loader_factory_retrieved = true;
-#endif  // DCHECK_IS_ON()
-      }
-      factory = g_url_loader_factory.Get().get();
+      factory = url_loader_factory_getter->GetNetworkFactory()->get();
     }
   }
 
   factory->CreateLoaderAndStart(
       std::move(url_loader_request), 0 /* routing_id? */, 0 /* request_id? */,
       mojom::kURLLoadOptionSendSSLInfo, *resource_request,
       std::move(url_loader_client_to_pass));
 }
 
 }  // namespace
@@ skipping 64 matching lines @@
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&PrepareNavigationStartOnIO,
                  base::Passed(std::move(new_request)), resource_context,
                  service_worker_navigation_handle
                      ? service_worker_navigation_handle->core()
                      : nullptr,
                  appcache_handle ? appcache_handle->core() : nullptr,
                  request_info_.get(), base::Passed(std::move(factory_ptr_info)),
+                 static_cast<StoragePartitionImpl*>(storage_partition)
+                     ->url_loader_factory_getter(),
                  base::Bind(&GetWebContentsFromFrameTreeNodeID,
                             request_info_->frame_tree_node_id),
                  base::Passed(std::move(loader_associated_request)),
                  base::Passed(std::move(url_loader_client_ptr_to_pass)),
                  base::Passed(ServiceManagerConnection::GetForProcess()
                                   ->GetConnector()
                                   ->Clone())));
 }
 
 NavigationURLLoaderNetworkService::~NavigationURLLoaderNetworkService() {}
 
-void NavigationURLLoaderNetworkService::OverrideURLLoaderFactoryForTesting(
-    mojom::URLLoaderFactoryPtr url_loader_factory) {
-  g_url_loader_factory.Get() = std::move(url_loader_factory);
-}
-
 void NavigationURLLoaderNetworkService::FollowRedirect() {
   url_loader_associated_ptr_->FollowRedirect();
 }
 
 void NavigationURLLoaderNetworkService::ProceedWithResponse() {}
 
 void NavigationURLLoaderNetworkService::OnReceiveResponse(
     const ResourceResponseHead& head,
     const base::Optional<net::SSLInfo>& ssl_info,
     mojom::DownloadedTempFilePtr downloaded_file) {
@@ skipping 53 matching lines @@
     TRACE_EVENT_ASYNC_END2("navigation", "Navigation timeToResponseStarted",
                            this, "&NavigationURLLoaderNetworkService", this,
                            "success", false);
 
     delegate_->OnRequestFailed(completion_status.exists_in_cache,
                                completion_status.error_code);
   }
 }
 
 }  // namespace content