Get rid of URLLoaderFactory in browser-side case

content/browser/appcache/appcache_url_loader_factory.cc

Index: content/browser/appcache/appcache_url_loader_factory.cc
diff --git a/content/browser/appcache/appcache_url_loader_factory.cc b/content/browser/appcache/appcache_url_loader_factory.cc
index 37c105abc9091b0170aa1fb9541736d9d434d9ec..0c450b5c54c148a25a533806def157f5423906b9 100644
--- a/content/browser/appcache/appcache_url_loader_factory.cc
+++ b/content/browser/appcache/appcache_url_loader_factory.cc
@@ -30,26 +30,25 @@ class AppCacheURLLoader : public AppCacheStorage::Delegate,
                           public mojom::URLLoader {
  public:
   AppCacheURLLoader(const ResourceRequest& request,
-                    mojom::URLLoaderAssociatedRequest url_loader_request,
                     int32_t routing_id,
                     int32_t request_id,
-                    mojom::URLLoaderClientPtr client_info,
                     ChromeAppCacheService* appcache_service,
                     URLLoaderFactoryGetter* factory_getter)
       : request_(request),
         routing_id_(routing_id),
         request_id_(request_id),
-        client_info_(std::move(client_info)),
         appcache_service_(appcache_service),
         factory_getter_(factory_getter),
-        binding_(this, std::move(url_loader_request)) {
-    binding_.set_connection_error_handler(base::Bind(
-        &AppCacheURLLoader::OnConnectionError, base::Unretained(this)));
-  }
+        binding_(this) {}
 
   ~AppCacheURLLoader() override {}
 
-  void Start() {
+  void Start(mojom::URLLoaderAssociatedRequest url_loader_request,
+             mojom::URLLoaderClientPtr client_info) override {
+    binding_.Bind(std::move(url_loader_request));
+    binding_.set_connection_error_handler(base::Bind(
+        &AppCacheURLLoader::OnConnectionError, base::Unretained(this)));
+    client_info_ = std::move(client_info);
     // If the origin does not exist in the AppCache usage map, then we can
     // safely call the network service here.
     if (appcache_service_->storage()->usage_map()->find(
@@ -169,10 +168,10 @@ void AppCacheURLLoaderFactory::CreateLoaderAndStart(
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   // This will get deleted when the connection is dropped by the client.
-  AppCacheURLLoader* loader = new AppCacheURLLoader(
-      request, std::move(url_loader_request), routing_id, request_id,
-      std::move(client), appcache_service_.get(), factory_getter_.get());
-  loader->Start();
+  AppCacheURLLoader* loader =
+      new AppCacheURLLoader(request, routing_id, request_id,
+                            appcache_service_.get(), factory_getter_.get());
+  loader->Start(std::move(url_loader_request), std::move(client));
 }
 
 void AppCacheURLLoaderFactory::SyncLoad(int32_t routing_id,
@@ -182,4 +181,4 @@ void AppCacheURLLoaderFactory::SyncLoad(int32_t routing_id,
   NOTREACHED();
 }
 
-}  // namespace content
+}  // namespace content