[merge to 3142] Revert "Fix failing ServiceWorkerVersionBrowserTest on Network Service bots"

content/browser/service_worker/service_worker_provider_host.cc

 // Copyright 2013 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_provider_host.h"
 
 #include <utility>
 
 #include "base/feature_list.h"
 #include "base/guid.h"
@@ skipping 82 matching lines @@
     // process, to have been destroyed before being claimed by the renderer. The
     // provider is then destroyed in the renderer, and no matching host will be
     // found.
     DCHECK(IsBrowserSideNavigationEnabled() &&
            ServiceWorkerUtils::IsBrowserAssignedProviderId(provider_id));
     return;
   }
   context->RemoveProviderHost(process_id, provider_id);
 }
 
-// Wraps associated request for another associated request.
-class AssociatedURLLoaderRelay final : public mojom::URLLoader {
- public:
-  static void CreateLoaderAndStart(
-      mojom::URLLoaderFactory* factory,
-      mojom::URLLoaderAssociatedRequest request,
-      int routing_id,
-      int request_id,
-      uint32_t options,
-      const ResourceRequest& resource_request,
-      mojom::URLLoaderClientPtr client,
-      const net::MutableNetworkTrafficAnnotationTag& traffic_annotation) {
-    mojom::URLLoaderAssociatedPtr associated_ptr;
-    mojom::URLLoaderAssociatedRequest associated_request =
-        mojo::MakeRequest(&associated_ptr);
-    factory->CreateLoaderAndStart(std::move(associated_request), routing_id,
-                                  request_id, options, resource_request,
-                                  std::move(client), traffic_annotation);
-    mojo::MakeStrongAssociatedBinding(
-        base::MakeUnique<AssociatedURLLoaderRelay>(std::move(associated_ptr)),
-        std::move(request));
-  }
-
-  explicit AssociatedURLLoaderRelay(
-      mojom::URLLoaderAssociatedPtr associated_ptr)
-      : associated_ptr_(std::move(associated_ptr)) {}
-  ~AssociatedURLLoaderRelay() override {}
-  void FollowRedirect() override { associated_ptr_->FollowRedirect(); }
-  void SetPriority(net::RequestPriority priority,
-                   int intra_priority_value) override {
-    associated_ptr_->SetPriority(priority, intra_priority_value);
-  }
-
- private:
-  mojom::URLLoaderAssociatedPtr associated_ptr_;
-  DISALLOW_COPY_AND_ASSIGN(AssociatedURLLoaderRelay);
-};
-
 // Used by a Service Worker for script loading only during the installation
 // time. For now this is just a proxy loader for the network loader.
 // Eventually this should replace the existing URLRequestJob-based request
 // interception for script loading, namely ServiceWorkerWriteToCacheJob.
 // TODO(kinuko): Implement this.
 class ScriptURLLoader : public mojom::URLLoader, public mojom::URLLoaderClient {
  public:
   ScriptURLLoader(
       int32_t routing_id,
       int32_t request_id,
@@ skipping 106 matching lines @@
   void CreateLoaderAndStart(mojom::URLLoaderAssociatedRequest request,
                             int32_t routing_id,
                             int32_t request_id,
                             uint32_t options,
                             const ResourceRequest& resource_request,
                             mojom::URLLoaderClientPtr client,
                             const net::MutableNetworkTrafficAnnotationTag&
                                 traffic_annotation) override {
     if (!ShouldHandleScriptRequest(resource_request)) {
       // If the request should not be handled by ScriptURLLoader, just
-      // fallback to the network. This needs a relaying as we use different
-      // associated message pipes.
+      // fallback to the network.
       // TODO(kinuko): Record the reason like what we do with netlog in
       // ServiceWorkerContextRequestHandler.
-      AssociatedURLLoaderRelay::CreateLoaderAndStart(
-          loader_factory_getter_->GetNetworkFactory()->get(),
+      loader_factory_getter_->GetNetworkFactory()->get()->CreateLoaderAndStart(
           std::move(request), routing_id, request_id, options, resource_request,
           std::move(client), traffic_annotation);
       return;
     }
     mojo::MakeStrongAssociatedBinding(
         base::MakeUnique<ScriptURLLoader>(
             routing_id, request_id, options, resource_request,
             std::move(client), context_, provider_host_, blob_storage_context_,
             loader_factory_getter_, traffic_annotation),
         std::move(request));
@@ skipping 869 matching lines @@
           render_thread_id_, provider_id(),
           GetOrCreateServiceWorkerHandle(
               associated_registration_->active_version()),
           false /* shouldNotifyControllerChange */,
           associated_registration_->active_version()->used_features()));
     }
   }
 }
 
 }  // namespace content