Move URL Loader creation to a separate factory object.

components/html_viewer/blink_platform_impl.cc

 // Copyright 2014 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 "components/html_viewer/blink_platform_impl.h"
 
 #include <cmath>
 
 #include "base/command_line.h"
 #include "base/rand_util.h"
@@ skipping 53 matching lines @@
     : main_thread_task_runner_(renderer_scheduler->DefaultTaskRunner()),
       main_thread_(
           new scheduler::WebThreadImplForRendererScheduler(renderer_scheduler)),
       shared_timer_func_(NULL),
       shared_timer_fire_time_(0.0),
       shared_timer_fire_time_was_set_while_suspended_(false),
       shared_timer_suspended_(0) {
   if (app) {
     mojo::URLRequestPtr request(mojo::URLRequest::New());
     request->url = mojo::String::From("mojo:network_service");
-    app->ConnectToService(request.Pass(), &network_service_);
+    mojo::ApplicationConnection* connection =
+        app->ConnectToApplication(request.Pass());
+    connection->ConnectToService(&network_service_);
+    connection->ConnectToService(&url_loader_factory_);
 
     mojo::CookieStorePtr cookie_store;
     network_service_->GetCookieStore(GetProxy(&cookie_store));
     cookie_jar_.reset(new WebCookieJarImpl(cookie_store.Pass()));
 
     mojo::ClipboardPtr clipboard;
     mojo::URLRequestPtr request2(mojo::URLRequest::New());
     request2->url = mojo::String::From("mojo:clipboard");
     app->ConnectToService(request2.Pass(), &clipboard);
     clipboard_.reset(new WebClipboardImpl(clipboard.Pass()));
@@ skipping 112 matching lines @@
           blink_resource_map_.GetResource(kDataResources[i].id, &length);
       CHECK(data != nullptr && length > 0);
       return blink::WebData(reinterpret_cast<const char*>(data), length);
     }
   }
   NOTREACHED() << "Requested resource is unavailable: " << resource;
   return blink::WebData();
 }
 
 blink::WebURLLoader* BlinkPlatformImpl::createURLLoader() {
-  return new WebURLLoaderImpl(network_service_.get(), &blob_registry_);
+  return new WebURLLoaderImpl(url_loader_factory_.get(), &blob_registry_);
 }
 
 blink::WebSocketHandle* BlinkPlatformImpl::createWebSocketHandle() {
   return new WebSocketHandleImpl(network_service_.get());
 }
 
 blink::WebString BlinkPlatformImpl::userAgent() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(kUserAgentSwitch)) {
     return blink::WebString::fromUTF8(
@@ skipping 88 matching lines @@
 BlinkPlatformImpl::notificationManager() {
   return &web_notification_manager_;
 }
 
 void BlinkPlatformImpl::UpdateWebThreadTLS(blink::WebThread* thread) {
   DCHECK(!current_thread_slot_.Get());
   current_thread_slot_.Set(thread);
 }
 
 }  // namespace html_viewer