Use Independent URLLoader

content/browser/loader/mojo_async_resource_handler.cc

 // 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.
 
 #include "content/browser/loader/mojo_async_resource_handler.h"
 
 #include <algorithm>
 #include <utility>
 #include <vector>
 
@@ skipping 42 matching lines @@
 
 void InitializeResourceBufferConstants() {
   static bool did_init = false;
   if (did_init)
     return;
   did_init = true;
 
   GetNumericArg("resource-buffer-size", &g_allocation_size);
 }
 
-void NotReached(mojom::URLLoaderAssociatedRequest mojo_request,
+void NotReached(mojom::URLLoaderRequest mojo_request,
                 mojom::URLLoaderClientPtr url_loader_client) {
   NOTREACHED();
 }
 
 }  // namespace
 
 // This class is for sharing the ownership of a ScopedDataPipeProducerHandle
 // between WriterIOBuffer and MojoAsyncResourceHandler.
 class MojoAsyncResourceHandler::SharedWriter final
     : public base::RefCountedThreadSafe<SharedWriter> {
@@ skipping 34 matching lines @@
 
   // This member is for keeping the writer alive.
   scoped_refptr<SharedWriter> writer_;
 
   DISALLOW_COPY_AND_ASSIGN(WriterIOBuffer);
 };
 
 MojoAsyncResourceHandler::MojoAsyncResourceHandler(
     net::URLRequest* request,
     ResourceDispatcherHostImpl* rdh,
-    mojom::URLLoaderAssociatedRequest mojo_request,
+    mojom::URLLoaderRequest mojo_request,
     mojom::URLLoaderClientPtr url_loader_client,
     ResourceType resource_type)
     : ResourceHandler(request),
       rdh_(rdh),
       binding_(this, std::move(mojo_request)),
       handle_watcher_(FROM_HERE, mojo::SimpleWatcher::ArmingPolicy::MANUAL),
       url_loader_client_(std::move(url_loader_client)),
       weak_factory_(this) {
   DCHECK(url_loader_client_);
   InitializeResourceBufferConstants();
@@ skipping 451 matching lines @@
 
 std::unique_ptr<UploadProgressTracker>
 MojoAsyncResourceHandler::CreateUploadProgressTracker(
     const tracked_objects::Location& from_here,
     UploadProgressTracker::UploadProgressReportCallback callback) {
   return base::MakeUnique<UploadProgressTracker>(from_here, std::move(callback),
                                                  request());
 }
 
 void MojoAsyncResourceHandler::OnTransfer(
-    mojom::URLLoaderAssociatedRequest mojo_request,
+    mojom::URLLoaderRequest mojo_request,
     mojom::URLLoaderClientPtr url_loader_client) {
   binding_.Unbind();
   binding_.Bind(std::move(mojo_request));
   binding_.set_connection_error_handler(
       base::Bind(&MojoAsyncResourceHandler::Cancel, base::Unretained(this)));
   url_loader_client_ = std::move(url_loader_client);
 }
 
 void MojoAsyncResourceHandler::SendUploadProgress(
     const net::UploadProgress& progress) {
   url_loader_client_->OnUploadProgress(
       progress.position(), progress.size(),
       base::Bind(&MojoAsyncResourceHandler::OnUploadProgressACK,
                  weak_factory_.GetWeakPtr()));
 }
 
 void MojoAsyncResourceHandler::OnUploadProgressACK() {
   if (upload_progress_tracker_)
     upload_progress_tracker_->OnAckReceived();
 }
 
 }  // namespace content