[Mojo-Loading] Use independent URLLoaderClient

content/browser/loader/mojo_async_resource_handler.h

Index: content/browser/loader/mojo_async_resource_handler.h
diff --git a/content/browser/loader/mojo_async_resource_handler.h b/content/browser/loader/mojo_async_resource_handler.h
index 4dd975c80a9da001cbbb5b8c999f7539b350bc95..9639460e1b65bb08c201cbf04fc794293b651ded 100644
--- a/content/browser/loader/mojo_async_resource_handler.h
+++ b/content/browser/loader/mojo_async_resource_handler.h
@@ -52,12 +52,11 @@ class CONTENT_EXPORT MojoAsyncResourceHandler
     : public ResourceHandler,
       public NON_EXPORTED_BASE(mojom::URLLoader) {
  public:
-  MojoAsyncResourceHandler(
-      net::URLRequest* request,
-      ResourceDispatcherHostImpl* rdh,
-      mojom::URLLoaderAssociatedRequest mojo_request,
-      mojom::URLLoaderClientAssociatedPtr url_loader_client,
-      ResourceType resource_type);
+  MojoAsyncResourceHandler(net::URLRequest* request,
+                           ResourceDispatcherHostImpl* rdh,
+                           mojom::URLLoaderAssociatedRequest mojo_request,
+                           mojom::URLLoaderClientPtr url_loader_client,
+                           ResourceType resource_type);
   ~MojoAsyncResourceHandler() override;
 
   // ResourceHandler implementation:
@@ -122,7 +121,7 @@ class CONTENT_EXPORT MojoAsyncResourceHandler
       UploadProgressTracker::UploadProgressReportCallback callback);
 
   void OnTransfer(mojom::URLLoaderAssociatedRequest mojo_request,
-                  mojom::URLLoaderClientAssociatedPtr url_loader_client);
+                  mojom::URLLoaderClientPtr url_loader_client);
   void SendUploadProgress(const net::UploadProgress& progress);
   void OnUploadProgressACK();
 
@@ -139,7 +138,7 @@ class CONTENT_EXPORT MojoAsyncResourceHandler
 
   mojo::Watcher handle_watcher_;
   std::unique_ptr<mojom::URLLoader> url_loader_;
-  mojom::URLLoaderClientAssociatedPtr url_loader_client_;
+  mojom::URLLoaderClientPtr url_loader_client_;
   scoped_refptr<net::IOBufferWithSize> buffer_;
   size_t buffer_offset_ = 0;
   size_t buffer_bytes_read_ = 0;