[merge to 3141] Revert "Create ServiceWorkerProviderHost before starting worker"

content/child/service_worker/service_worker_network_provider.h

 // 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.
 
 #ifndef CONTENT_CHILD_SERVICE_WORKER_SERVICE_WORKER_NETWORK_PROVIDER_H_
 #define CONTENT_CHILD_SERVICE_WORKER_SERVICE_WORKER_NETWORK_PROVIDER_H_
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/supports_user_data.h"
 #include "content/common/content_export.h"
 #include "content/common/service_worker/service_worker.mojom.h"
-#include "content/common/service_worker/service_worker_provider.mojom.h"
 
 namespace blink {
 class WebLocalFrame;
 class WebServiceWorkerNetworkProvider;
 }  // namespace blink
 
 namespace content {
 
 struct RequestNavigationParams;
 class ServiceWorkerProviderContext;
@@ skipping 22 matching lines @@
   // CreateForNavigation.
   static ServiceWorkerNetworkProvider* FromWebServiceWorkerNetworkProvider(
       blink::WebServiceWorkerNetworkProvider*);
 
   // PlzNavigate
   // The |browser_provider_id| is initialized by the browser for navigations.
   ServiceWorkerNetworkProvider(int route_id,
                                ServiceWorkerProviderType type,
                                int browser_provider_id,
                                bool is_parent_frame_secure);
-  // This is for service worker clients.
   ServiceWorkerNetworkProvider(int route_id,
                                ServiceWorkerProviderType type,
                                bool is_parent_frame_secure);
-  // This is for controllers.
-  explicit ServiceWorkerNetworkProvider(
-      mojom::ServiceWorkerProviderInfoForStartWorkerPtr info);
 
   ServiceWorkerNetworkProvider();
   ~ServiceWorkerNetworkProvider();
 
   int provider_id() const { return provider_id_; }
   ServiceWorkerProviderContext* context() const { return context_.get(); }
 
+  // This method is called for a provider that's associated with a
+  // running service worker script. The version_id indicates which
+  // ServiceWorkerVersion should be used.
+  void SetServiceWorkerVersionId(int64_t version_id, int embedded_worker_id);
+
   bool IsControlledByServiceWorker() const;
 
  private:
   const int provider_id_;
   scoped_refptr<ServiceWorkerProviderContext> context_;
   mojom::ServiceWorkerDispatcherHostAssociatedPtr dispatcher_host_;
   mojom::ServiceWorkerProviderHostAssociatedPtr provider_host_;
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerNetworkProvider);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_SERVICE_WORKER_SERVICE_WORKER_NETWORK_PROVIDER_H_