Create ServiceWorkerProviderHost before starting worker

content/browser/service_worker/service_worker_version.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_version.h"
 
 #include <stddef.h>
 
 #include <limits>
 #include <map>
@@ skipping 809 matching lines @@
     ServiceWorkerMetrics::EventType event_type)
     : error_callback(callback),
       start_time(time),
       start_time_ticks(time_ticks),
       event_type(event_type) {}
 
 ServiceWorkerVersion::PendingRequest::~PendingRequest() {}
 
 void ServiceWorkerVersion::OnThreadStarted() {
   DCHECK_EQ(EmbeddedWorkerStatus::STARTING, running_status());
+  DCHECK(provider_host_);
+  provider_host_->SetReadyToSendMessagesToWorker(
+      embedded_worker()->thread_id());
   // Activate ping/pong now that JavaScript execution will start.
   ping_controller_->Activate();
 }
 
 void ServiceWorkerVersion::OnStarting() {
   for (auto& observer : listeners_)
     observer.OnRunningStateChanged(this);
 }
 
+void ServiceWorkerVersion::OnStartWorkerMessageSent() {
+  DCHECK(pending_provider_host_);
+  context()->AddProviderHost(std::move(pending_provider_host_));
+}
+
 void ServiceWorkerVersion::OnStarted() {
   DCHECK_EQ(EmbeddedWorkerStatus::RUNNING, running_status());
   RestartTick(&idle_time_);
 
   // Fire all start callbacks.
   scoped_refptr<ServiceWorkerVersion> protect(this);
   FinishStartWorker(SERVICE_WORKER_OK);
   for (auto& observer : listeners_)
     observer.OnRunningStateChanged(this);
 }
@@ skipping 572 matching lines @@
   DCHECK_EQ(EmbeddedWorkerStatus::STOPPED, running_status());
 
   if (!ServiceWorkerMetrics::ShouldExcludeSiteFromHistogram(site_for_uma_)) {
     DCHECK(!event_recorder_);
     event_recorder_ =
         base::MakeUnique<ServiceWorkerMetrics::ScopedEventRecorder>();
   }
 
   StartTimeoutTimer();
 
+  DCHECK(!pending_provider_host_);
+  pending_provider_host_ =
+      ServiceWorkerProviderHost::PreCreateForWorkerContext(this, context());
+  provider_host_ = pending_provider_host_->AsWeakPtr();
+
   auto params = base::MakeUnique<EmbeddedWorkerStartParams>();
   params->service_worker_version_id = version_id_;
   params->scope = scope_;
   params->script_url = script_url_;
   params->is_installed = IsInstalled(status_);
   params->pause_after_download = pause_after_download_;
+  params->controller_provider = pending_provider_host_.get();
 
   embedded_worker_->Start(
       std::move(params), mojo::MakeRequest(&event_dispatcher_),
       base::Bind(&ServiceWorkerVersion::OnStartSentAndScriptEvaluated,
                  weak_factory_.GetWeakPtr()));
 }
 
 void ServiceWorkerVersion::StartTimeoutTimer() {
   DCHECK(!timeout_timer_.IsRunning());
 
@@ skipping 372 matching lines @@
 
 void ServiceWorkerVersion::CleanUpExternalRequest(
     const std::string& request_uuid,
     ServiceWorkerStatusCode status) {
   if (status == SERVICE_WORKER_OK)
     return;
   external_request_uuid_to_request_id_.erase(request_uuid);
 }
 
 }  // namespace content