Fix the current per-frame URLLoaderFactory code path.

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 45 matching lines @@
 #include "content/renderer/image_capture/image_capture_frame_grabber.h"
 #include "content/renderer/media/audio_decoder.h"
 #include "content/renderer/media/audio_device_factory.h"
 #include "content/renderer/media/renderer_webaudiodevice_impl.h"
 #include "content/renderer/media/renderer_webmidiaccessor_impl.h"
 #include "content/renderer/media_capture_from_element/canvas_capture_handler.h"
 #include "content/renderer/media_capture_from_element/html_audio_element_capturer_source.h"
 #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"
 #include "content/renderer/webgraphicscontext3d_provider_impl.h"
 #include "content/renderer/webpublicsuffixlist_impl.h"
 #include "device/gamepad/public/cpp/gamepads.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/config/gpu_info.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
 #include "gpu/ipc/common/gpu_stream_constants.h"
@@ skipping 224 matching lines @@
   sandbox_support_.reset();
 #endif
 }
 
 //------------------------------------------------------------------------------
 
 std::unique_ptr<blink::WebURLLoader>
 RendererBlinkPlatformImpl::CreateURLLoader() {
   ChildThreadImpl* child_thread = ChildThreadImpl::current();
 
-  const bool network_service_enabled =
-      base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableNetworkService);
-
-  mojom::URLLoaderFactory* factory = nullptr;
-  if (!network_service_enabled) {
-    if (child_thread) {
+  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 {
       child_thread->channel()->GetRemoteAssociatedInterface(
           &url_loader_factory_);
-    }
-    factory = url_loader_factory_.get();
-  } else {
-    // If there's a URLLoaderFactory attached to the frame, use it.
-    // TODO(yhirano|scottmg): Make the URLLoaderFactory always a per-frame
-    // thing? See https://crbug.com/712913.
-    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();
+      factory = 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 948 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