Move URL Loader creation to a separate factory object.

mojo/shell/application_manager.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 "mojo/shell/application_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 161 matching lines @@
     return;
   }
 
   if (resolved_url.SchemeIsFile()) {
     new LocalFetcher(
         resolved_url, GetBaseURLAndQuery(resolved_url, nullptr),
         base::Bind(callback, NativeApplicationCleanup::DONT_DELETE));
     return;
   }
 
-  if (!network_service_)
-    ConnectToService(GURL("mojo:network_service"), &network_service_);
+  if (!url_loader_factory_)
+    ConnectToService(GURL("mojo:network_service"), &url_loader_factory_);
 
   const NativeApplicationCleanup cleanup =
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDontDeleteOnDownload)
           ? NativeApplicationCleanup::DONT_DELETE
           : NativeApplicationCleanup::DELETE;
 
   if (requested_gurl.SchemeIs("mojo")) {
     // Use the resolved mojo URL in the request to support origin mapping, etc.
     mojo::URLRequestPtr resolved_url_request(mojo::URLRequest::New());
     resolved_url_request->url = resolved_url.spec();
     new NetworkFetcher(disable_cache_, resolved_url_request.Pass(),
-                       network_service_.get(), base::Bind(callback, cleanup));
+                       url_loader_factory_.get(),
+                       base::Bind(callback, cleanup));
     return;
   }
 
   new NetworkFetcher(disable_cache_, requested_url.Pass(),
-                     network_service_.get(), base::Bind(callback, cleanup));
+                     url_loader_factory_.get(), base::Bind(callback, cleanup));
 }
 
 bool ApplicationManager::ConnectToRunningApplication(
     const GURL& resolved_url,
     const std::string& qualifier,
     const GURL& requestor_url,
     InterfaceRequest<ServiceProvider>* services,
     ServiceProviderPtr* exposed_services) {
   GURL application_url = GetBaseURLAndQuery(resolved_url, nullptr);
   ShellImpl* shell_impl = GetShellImpl(application_url, qualifier);
@@ skipping 323 matching lines @@
   return pipe.handle0.Pass();
 }
 
 void ApplicationManager::CleanupRunner(NativeRunner* runner) {
   native_runners_.erase(
       std::find(native_runners_.begin(), native_runners_.end(), runner));
 }
 
 }  // namespace shell
 }  // namespace mojo