network service: pass a URLLoaderFactory to renderers on SW registration

content/renderer/renderer_blink_platform_impl.cc

 // Copyright (c) 2012 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/renderer/renderer_blink_platform_impl.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 13 matching lines @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "components/url_formatter/url_formatter.h"
 #include "content/child/blob_storage/webblobregistry_impl.h"
 #include "content/child/database_util.h"
 #include "content/child/file_info_util.h"
 #include "content/child/fileapi/webfilesystem_impl.h"
 #include "content/child/indexed_db/webidbfactory_impl.h"
 #include "content/child/quota_dispatcher.h"
 #include "content/child/quota_message_filter.h"
+#include "content/child/service_worker/service_worker_dispatcher.h"
 #include "content/child/storage_util.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/web_database_observer_impl.h"
 #include "content/child/web_url_loader_impl.h"
 #include "content/child/webfileutilities_impl.h"
 #include "content/child/webmessageportchannel_impl.h"
 #include "content/common/file_utilities_messages.h"
 #include "content/common/frame_messages.h"
 #include "content/common/render_process_messages.h"
 #include "content/public/common/content_switches.h"
@@ skipping 256 matching lines @@
   sandbox_support_.reset();
 #endif
 }
 
 //------------------------------------------------------------------------------
 
 std::unique_ptr<blink::WebURLLoader>
 RendererBlinkPlatformImpl::CreateURLLoader() {
   ChildThreadImpl* child_thread = ChildThreadImpl::current();
 
-  mojom::URLLoaderFactory* factory =
-      url_loader_factory_ ? url_loader_factory_.get()
-                          : network_service_url_loader_factory_.get();
-  if (!factory && child_thread) {
-    bool network_service_enabled =
-        base::CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kEnableNetworkService);
-    if (network_service_enabled) {
-      connector_->BindInterface(mojom::kNetworkServiceName,
-                                &network_service_url_loader_factory_);
-      factory = network_service_url_loader_factory_.get();
-    } else {
+  const bool network_service_enabled =
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableNetworkService);
+
+  mojom::URLLoaderFactory* factory = nullptr;
+  if (!network_service_enabled) {
+    if (child_thread) {
       child_thread->channel()->GetRemoteAssociatedInterface(
           &url_loader_factory_);
-      factory = url_loader_factory_.get();
+    }
+    factory = url_loader_factory_.get();
+  } else {
+    ServiceWorkerDispatcher* sw_dispatcher =
+        ServiceWorkerDispatcher::GetThreadSpecificInstance();
+    if (sw_dispatcher && sw_dispatcher->GetURLLoaderFactory()) {
+      factory = sw_dispatcher->GetURLLoaderFactory();
+    } else {
+      if (!network_service_url_loader_factory_) {
+        connector_->BindInterface(mojom::kNetworkServiceName,
+                                  &network_service_url_loader_factory_);
+      }
+      factory = network_service_url_loader_factory_.get();
     }
   }
 
   // There may be no child thread in RenderViewTests.  These tests can still use
   // data URLs to bypass the ResourceDispatcher.
   return base::MakeUnique<WebURLLoaderImpl>(
       child_thread ? child_thread->resource_dispatcher() : nullptr, factory);
 }
 
 blink::WebThread* RendererBlinkPlatformImpl::CurrentThread() {
@@ skipping 956 matching lines @@
 //------------------------------------------------------------------------------
 void RendererBlinkPlatformImpl::RequestPurgeMemory() {
   // TODO(tasak|bashi): We should use ChildMemoryCoordinator here, but
   // ChildMemoryCoordinator isn't always available as it's only initialized
   // when kMemoryCoordinatorV0 is enabled.
   // Use ChildMemoryCoordinator when memory coordinator is always enabled.
   base::MemoryCoordinatorClientRegistry::GetInstance()->PurgeMemory();
 }
 
 }  // namespace content