Revert "Create ServiceWorkerProviderHost before starting worker"

content/child/service_worker/service_worker_network_provider.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/child/service_worker/service_worker_network_provider.h"
 
 #include "base/atomic_sequence_num.h"
 #include "content/child/child_thread_impl.h"
 #include "content/child/request_extra_data.h"
-#include "content/child/service_worker/service_worker_dispatcher.h"
 #include "content/child/service_worker/service_worker_handle_reference.h"
 #include "content/child/service_worker/service_worker_provider_context.h"
 #include "content/common/navigation_params.h"
 #include "content/common/service_worker/service_worker_messages.h"
 #include "content/common/service_worker/service_worker_provider_host_info.h"
 #include "content/common/service_worker/service_worker_utils.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "ipc/ipc_sync_channel.h"
 #include "mojo/public/cpp/bindings/associated_group.h"
 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
@@ skipping 180 matching lines @@
 
 ServiceWorkerNetworkProvider::ServiceWorkerNetworkProvider(
     int route_id,
     ServiceWorkerProviderType provider_type,
     bool is_parent_frame_secure)
     : ServiceWorkerNetworkProvider(route_id,
                                    provider_type,
                                    GetNextProviderId(),
                                    is_parent_frame_secure) {}
 
-ServiceWorkerNetworkProvider::ServiceWorkerNetworkProvider(
-    mojom::ServiceWorkerProviderInfoForStartWorkerPtr info)
-    : provider_id_(info->provider_id) {
-  context_ = new ServiceWorkerProviderContext(
-      provider_id_, SERVICE_WORKER_PROVIDER_FOR_CONTROLLER,
-      std::move(info->client_request),
-      ChildThreadImpl::current()->thread_safe_sender());
-
-  ServiceWorkerDispatcher* dispatcher =
-      ServiceWorkerDispatcher::GetOrCreateThreadSpecificInstance(
-          ChildThreadImpl::current()->thread_safe_sender(),
-          base::ThreadTaskRunnerHandle::Get().get());
-  // TODO(shimazu): Set registration/attributes directly to |context_|.
-  dispatcher->OnAssociateRegistration(-1 /* unused thread_id */,
-                                      info->provider_id, info->registration,
-                                      info->attributes);
-  provider_host_.Bind(std::move(info->host_ptr_info));
-}
-
 ServiceWorkerNetworkProvider::ServiceWorkerNetworkProvider()
     : provider_id_(kInvalidServiceWorkerProviderId) {}
 
 ServiceWorkerNetworkProvider::~ServiceWorkerNetworkProvider() {
   if (provider_id_ == kInvalidServiceWorkerProviderId)
     return;
   if (!ChildThreadImpl::current())
     return;  // May be null in some tests.
   provider_host_.reset();
 }
 
+void ServiceWorkerNetworkProvider::SetServiceWorkerVersionId(
+    int64_t version_id,
+    int embedded_worker_id) {
+  DCHECK_NE(kInvalidServiceWorkerProviderId, provider_id_);
+  if (!ChildThreadImpl::current())
+    return;  // May be null in some tests.
+  dispatcher_host_->OnSetHostedVersionId(provider_id(), version_id,
+                                         embedded_worker_id);
+}
+
 bool ServiceWorkerNetworkProvider::IsControlledByServiceWorker() const {
   if (ServiceWorkerUtils::IsServicificationEnabled()) {
     // Interception for subresource loading is not working (yet)
     // when servicification is enabled.
     return false;
   }
   return context() && context()->controller();
 }
 
 }  // namespace content