Move URL Loader creation to a separate factory object.

components/html_viewer/html_viewer.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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/html_viewer/html_document.h"
 #include "components/html_viewer/setup.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/application/public/cpp/connect.h"
 #include "mojo/application/public/cpp/interface_factory_impl.h"
 #include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
+#include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/mojo/src/mojo/public/c/system/main.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
 
 using mojo::ApplicationConnection;
 using mojo::Array;
 using mojo::BindToRequest;
 using mojo::ContentHandler;
 using mojo::InterfaceRequest;
 using mojo::ServiceProvider;
@@ skipping 19 matching lines @@
         setup_(setup) {
   }
 
   ~HTMLViewerApplication() override {
   }
 
   void Initialize(ShellPtr shell, const String& url) override {
     shell_ = shell.Pass();
     mojo::URLRequestPtr request(mojo::URLRequest::New());
     request->url = mojo::String::From("mojo:network_service");
-    setup_->app()->ConnectToService(request.Pass(), &network_service_);
+    mojo::ApplicationConnection* connection =
+        setup_->app()->ConnectToApplication(request.Pass());
+    connection->ConnectToService(&network_service_);
+    connection->ConnectToService(&url_loader_factory_);
   }
 
   void AcceptConnection(const String& requestor_url,
                         InterfaceRequest<ServiceProvider> services,
                         ServiceProviderPtr exposed_services,
                         const String& url) override {
     if (initial_response_) {
       OnResponseReceived(URLLoaderPtr(), services.Pass(),
                          initial_response_.Pass());
     } else {
       URLLoaderPtr loader;
-      network_service_->CreateURLLoader(GetProxy(&loader));
+      url_loader_factory_->CreateURLLoader(GetProxy(&loader));
       mojo::URLRequestPtr request(mojo::URLRequest::New());
       request->url = url_;
       request->auto_follow_redirects = true;
 
       // |loader| will be pass to the OnResponseReceived method through a
       // callback. Because order of evaluation is undefined, a reference to the
       // raw pointer is needed.
       mojo::URLLoader* raw_loader = loader.get();
       raw_loader->Start(
           request.Pass(),
@@ skipping 15 matching lines @@
     // HTMLDocument is destroyed when the hosting view is destroyed.
     // TODO(sky): when headless, this leaks.
     new HTMLDocument(services.Pass(), response.Pass(), shell_.Pass(), setup_);
   }
 
   scoped_ptr<mojo::AppRefCount> app_refcount_;
   String url_;
   mojo::StrongBinding<mojo::Application> binding_;
   ShellPtr shell_;
   mojo::NetworkServicePtr network_service_;
+  mojo::URLLoaderFactoryPtr url_loader_factory_;
   URLResponsePtr initial_response_;
   Setup* setup_;
 
   DISALLOW_COPY_AND_ASSIGN(HTMLViewerApplication);
 };
 
 class ContentHandlerImpl : public mojo::ContentHandler {
  public:
   ContentHandlerImpl(Setup* setup,
                      mojo::InterfaceRequest<ContentHandler> request)
@@ skipping 49 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(HTMLViewer);
 };
 
 }  // namespace html_viewer
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(new html_viewer::HTMLViewer);
   return runner.Run(shell_handle);
 }