Get rid of URLLoaderFactory in browser-side case

content/browser/loader/navigation_url_loader_network_service.cc

Index: content/browser/loader/navigation_url_loader_network_service.cc
diff --git a/content/browser/loader/navigation_url_loader_network_service.cc b/content/browser/loader/navigation_url_loader_network_service.cc
index 4136c41cf977a64d301fec1cf407f5d1006f1041..e7e76d9316fcfe05d83943f0ab72cf982ade4ce9 100644
--- a/content/browser/loader/navigation_url_loader_network_service.cc
+++ b/content/browser/loader/navigation_url_loader_network_service.cc
@@ -59,11 +59,10 @@ WebContents* GetWebContentsFromFrameTreeNodeID(int frame_tree_node_id) {
 
 // Kept around during the lifetime of the navigation request, and is
 // responsible for dispatching a ResourceRequest to the appropriate
-// URLLoaderFactory.  In order to get the right URLLoaderFactory it
-// builds a vector of URLLoaderRequestHandler's and successively calls
-// MaybeCreateLoaderFactory on each until the request is successfully
-// handled. The same sequence may be performed multiple times when
-// redirects happen.
+// URLLoader.  In order to get the right URLLoader it builds a vector
+// of URLLoaderRequestHandler's and successively calls MaybeCreateLoader
+// on each until the request is successfully handled.
+// The same sequence may be performed multiple times when redirects happen.
 class NavigationURLLoaderNetworkService::URLLoaderRequestController {
  public:
   URLLoaderRequestController(
@@ -145,19 +144,17 @@ class NavigationURLLoaderNetworkService::URLLoaderRequestController {
     MaybeStartLoader(nullptr);
   }
 
-  void MaybeStartLoader(mojom::URLLoaderFactory* factory) {
+  void MaybeStartLoader(mojom::URLLoader* loader) {
     DCHECK(url_loader_client_ptr_.is_bound());
 
-    if (factory) {
-      factory->CreateLoaderAndStart(
-          std::move(url_loader_request_), 0 /* routing_id? */,
-          0 /* request_id? */, mojom::kURLLoadOptionSendSSLInfo,
-          *resource_request_, std::move(url_loader_client_ptr_));
+    if (loader) {
+      loader->Start(std::move(url_loader_request_),
+                    std::move(url_loader_client_ptr_));
       return;
     }
 
     if (handler_index_ < handlers_.size()) {
-      handlers_[handler_index_++]->MaybeCreateLoaderFactory(
+      handlers_[handler_index_++]->MaybeCreateLoader(
           *resource_request_, resource_context_,
           base::BindOnce(&URLLoaderRequestController::MaybeStartLoader,
                          base::Unretained(this)));
@@ -165,12 +162,16 @@ class NavigationURLLoaderNetworkService::URLLoaderRequestController {
     }
 
     DCHECK_EQ(handlers_.size(), handler_index_);
+    mojom::URLLoaderFactory* factory = nullptr;
     if (resource_request_->url.SchemeIs(url::kBlobScheme)) {
       factory = url_loader_factory_getter_->GetBlobFactory()->get();
     } else {
       factory = url_loader_factory_getter_->GetNetworkFactory()->get();
     }
-    MaybeStartLoader(factory);
+    factory->CreateLoaderAndStart(
+        std::move(url_loader_request_), 0 /* routing_id? */,
+        0 /* request_id? */, mojom::kURLLoadOptionSendSSLInfo,
+        *resource_request_, std::move(url_loader_client_ptr_));
   }
 
  private: