[Mojo-Loading] Use independent URLLoaderClient

content/browser/loader/mojo_async_resource_handler.h

 // Copyright 2016 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.
 
 #ifndef CONTENT_BROWSER_LOADER_MOJO_ASYNC_RESOURCE_HANDLER_H_
 #define CONTENT_BROWSER_LOADER_MOJO_ASYNC_RESOURCE_HANDLER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 34 matching lines @@
 // when LoadingWithMojo runtime flag is enabled.
 //
 // TODO(yhirano): Add histograms.
 // TODO(yhirano): Send cached metadata.
 //
 // This class can be inherited only for tests.
 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:
   void OnRequestRedirected(
       const net::RedirectInfo& redirect_info,
       ResourceResponse* response,
       std::unique_ptr<ResourceController> controller) override;
   void OnResponseStarted(
       ResourceResponse* response,
       std::unique_ptr<ResourceController> controller) override;
@@ skipping 44 matching lines @@
   // |reported_total_received_bytes_|.
   int64_t CalculateRecentlyReceivedBytes();
 
   // These functions can be overriden only for tests.
   virtual void ReportBadMessage(const std::string& error);
   virtual std::unique_ptr<UploadProgressTracker> CreateUploadProgressTracker(
       const tracked_objects::Location& from_here,
       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();
 
   ResourceDispatcherHostImpl* rdh_;
   mojo::AssociatedBinding<mojom::URLLoader> binding_;
 
   bool has_checked_for_sufficient_resources_ = false;
   bool sent_received_response_message_ = false;
   bool is_using_io_buffer_not_from_writer_ = false;
   bool did_defer_on_writing_ = false;
   bool did_defer_on_redirect_ = false;
   base::TimeTicks response_started_ticks_;
   int64_t reported_total_received_bytes_ = 0;
 
   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;
   scoped_refptr<SharedWriter> shared_writer_;
   mojo::ScopedDataPipeConsumerHandle response_body_consumer_handle_;
 
   std::unique_ptr<UploadProgressTracker> upload_progress_tracker_;
 
   base::WeakPtrFactory<MojoAsyncResourceHandler> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(MojoAsyncResourceHandler);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_LOADER_MOJO_ASYNC_RESOURCE_HANDLER_H_