network service: Plumbing to get URLLoaderFactory to renderer on nav commit

content/renderer/renderer_blink_platform_impl.cc

Index: content/renderer/renderer_blink_platform_impl.cc
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index 371943b8479728f0ed260c7f5fb9d352511f2f40..b6caffadc9d5d36ab62c4a6a52119ec766670ac7 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -63,6 +63,7 @@
 #include "content/renderer/media_capture_from_element/html_video_element_capturer_source.h"
 #include "content/renderer/media_recorder/media_recorder_handler.h"
 #include "content/renderer/mojo/blink_interface_provider_impl.h"
+#include "content/renderer/render_frame_impl.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/renderer_clipboard_delegate.h"
 #include "content/renderer/webclipboard_impl.h"
@@ -304,21 +305,31 @@ 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 {
+    // If there's a URLLoaderFactory attached to the frame, use it.

[kinuko, 2017/05/02 03:37:50]

Can you put a short todo comment like: "TODO(crbug.com/712913): make
URLLoaderFactory always a per-frame thing"

[scottmg, 2017/05/02 15:19:22]

Done.

+    blink::WebLocalFrame* const web_frame =
+        blink::WebLocalFrame::FrameForCurrentContext();
+    RenderFrameImpl* render_frame =
+        static_cast<RenderFrameImpl*>(RenderFrame::FromWebFrame(web_frame));
+    if (render_frame && render_frame->GetURLLoaderFactory()) {
+      factory = render_frame->GetURLLoaderFactory();
+    } else {
+      if (!network_service_url_loader_factory_) {
+        connector_->BindInterface(mojom::kNetworkServiceName,
+                                  &network_service_url_loader_factory_);
+      }
+      factory = network_service_url_loader_factory_.get();
     }
   }