Use Independent URLLoader

content/browser/service_worker/service_worker_fetch_dispatcher.cc

 // Copyright 2014 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/service_worker/service_worker_fetch_dispatcher.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 28 matching lines @@
 #include "net/url_request/url_request.h"
 
 namespace content {
 
 namespace {
 
 // This class wraps a mojo::AssociatedInterfacePtr<URLLoader>. It also is a
 // URLLoader implementation and delegates URLLoader calls to the wrapped loader.
 class DelegatingURLLoader final : public mojom::URLLoader {
  public:
-  explicit DelegatingURLLoader(mojom::URLLoaderAssociatedPtr loader)
+  explicit DelegatingURLLoader(mojom::URLLoaderPtr loader)
       : binding_(this), loader_(std::move(loader)) {}
   ~DelegatingURLLoader() override {}
 
   void FollowRedirect() override { loader_->FollowRedirect(); }
 
   void SetPriority(net::RequestPriority priority,
                    int intra_priority_value) override {
     loader_->SetPriority(priority, intra_priority_value);
   }
 
   mojom::URLLoaderPtr CreateInterfacePtrAndBind() {
     mojom::URLLoaderPtr loader;
     binding_.Bind(mojo::MakeRequest(&loader));
     // This unretained pointer is safe, because |binding_| is owned by |this|
     // and the callback will never be called after |this| is destroyed.
     binding_.set_connection_error_handler(
         base::Bind(&DelegatingURLLoader::Cancel, base::Unretained(this)));
     return loader;
   }
 
  private:
   // Called when the mojom::URLLoaderPtr in the service worker is deleted.
   void Cancel() {
     // Cancel loading as stated in url_loader.mojom.
     loader_ = nullptr;
   }
 
   mojo::Binding<mojom::URLLoader> binding_;
-  mojom::URLLoaderAssociatedPtr loader_;
+  mojom::URLLoaderPtr loader_;
 
   DISALLOW_COPY_AND_ASSIGN(DelegatingURLLoader);
 };
 
 ServiceWorkerDevToolsAgentHost* GetAgentHost(
     const std::pair<int, int>& worker_id) {
   return ServiceWorkerDevToolsManager::GetInstance()
       ->GetDevToolsAgentHostForWorker(worker_id.first, worker_id.second);
 }
 
@@ skipping 565 matching lines @@
   DCHECK_LT(request_id, -1);
 
   preload_handle_ = mojom::FetchEventPreloadHandle::New();
   mojom::URLLoaderClientPtr url_loader_client_ptr;
   preload_handle_->url_loader_client_request =
       mojo::MakeRequest(&url_loader_client_ptr);
   auto url_loader_client = base::MakeUnique<DelegatingURLLoaderClient>(
       std::move(url_loader_client_ptr), std::move(on_response), request);
   mojom::URLLoaderClientPtr url_loader_client_ptr_to_pass;
   url_loader_client->Bind(&url_loader_client_ptr_to_pass);
-  mojom::URLLoaderAssociatedPtr url_loader_associated_ptr;
+  mojom::URLLoaderPtr url_loader_associated_ptr;
 
   url_loader_factory->CreateLoaderAndStart(
       mojo::MakeRequest(&url_loader_associated_ptr),
       original_info->GetRouteID(), request_id, mojom::kURLLoadOptionNone,
       request, std::move(url_loader_client_ptr_to_pass),
       net::MutableNetworkTrafficAnnotationTag(
           original_request->traffic_annotation()));
 
   std::unique_ptr<DelegatingURLLoader> url_loader(
       base::MakeUnique<DelegatingURLLoader>(
@@ skipping 17 matching lines @@
     ServiceWorkerVersion* version,
     int event_finish_id,
     scoped_refptr<URLLoaderAssets> url_loader_assets,
     ServiceWorkerStatusCode status,
     base::Time dispatch_event_time) {
   version->FinishRequest(event_finish_id, status != SERVICE_WORKER_ERROR_ABORT,
                          dispatch_event_time);
 }
 
 }  // namespace content