ServiceWorker: Exchange InterfaceProviders when starting worker thread

content/browser/service_worker/embedded_worker_instance.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/embedded_worker_instance.h"
 
 #include <utility>
 
 #include "base/bind_helpers.h"
 #include "base/macros.h"
@@ skipping 433 matching lines @@
     return;
   }
   DCHECK(status_ == EmbeddedWorkerStatus::STOPPED);
 
   DCHECK(!params->pause_after_download || !params->is_installed);
   DCHECK_NE(kInvalidServiceWorkerVersionId, params->service_worker_version_id);
   step_time_ = base::TimeTicks::Now();
   status_ = EmbeddedWorkerStatus::STARTING;
   starting_phase_ = ALLOCATING_PROCESS;
   network_accessed_for_script_ = false;
+  binding_.Close();
   interface_registry_.reset(new shell::InterfaceRegistry);
   remote_interfaces_.reset(new shell::InterfaceProvider);
   FOR_EACH_OBSERVER(Listener, listener_list_, OnStarting());
 
   params->embedded_worker_id = embedded_worker_id_;
   params->worker_devtools_agent_route_id = MSG_ROUTING_NONE;
   params->wait_for_debugger = false;
   params->settings.v8_cache_options = GetV8CacheOptions();
 
+  interface_registry_->AddInterface(
+      base::Bind(&EmbeddedWorkerInstance::BindMojoRequest, AsWeakPtr()));
+
   mojom::EmbeddedWorkerInstanceClientRequest request =
       GetProxy(&instance_client_);
   instance_client_.set_connection_error_handler(
       base::Bind(&EmbeddedWorkerInstance::Detach, AsWeakPtr()));
 
   inflight_start_task_.reset(
       new StartTask(this, params->script_url, std::move(request)));
   inflight_start_task_->Start(std::move(params), callback);
 }
 
@@ skipping 85 matching lines @@
 
 EmbeddedWorkerInstance::EmbeddedWorkerInstance(
     base::WeakPtr<ServiceWorkerContextCore> context,
     int embedded_worker_id)
     : context_(context),
       registry_(context->embedded_worker_registry()),
       embedded_worker_id_(embedded_worker_id),
       status_(EmbeddedWorkerStatus::STOPPED),
       starting_phase_(NOT_STARTING),
       thread_id_(kInvalidEmbeddedWorkerThreadId),
+      binding_(this),
       devtools_attached_(false),
       network_accessed_for_script_(false),
       weak_factory_(this) {}
 
 void EmbeddedWorkerInstance::OnProcessAllocated(
     std::unique_ptr<WorkerProcessHandle> handle,
     ServiceWorkerMetrics::StartSituation start_situation) {
   DCHECK_EQ(EmbeddedWorkerStatus::STARTING, status_);
   DCHECK(!process_handle_);
 
@@ skipping 31 matching lines @@
   mojo_params->pause_after_download = params->pause_after_download;
   mojo_params->wait_for_debugger = params->wait_for_debugger;
   mojo_params->is_installed = params->is_installed;
 
   mojo_params->settings = mojom::EmbeddedWorkerSettings::New();
   mojo_params->settings->data_saver_enabled =
       params->settings.data_saver_enabled;
   mojo_params->settings->v8_cache_options =
       static_cast<mojom::V8CacheOptions>(params->settings.v8_cache_options);
 
-  instance_client_->StartWorker(std::move(mojo_params));
+  shell::mojom::InterfaceProviderPtr exposed_interfaces;
+  interface_registry_->Bind(GetProxy(&exposed_interfaces));
+
+  instance_client_->StartWorker(std::move(mojo_params),
+                                std::move(exposed_interfaces));
   registry_->AddWorker(process_id(), embedded_worker_id());
   TRACE_EVENT_ASYNC_STEP_PAST1("ServiceWorker", "EmbeddedWorkerInstance::Start",
                                this, "SendStartWorker", "Status", "mojo");
   OnStartWorkerMessageSent();
   return;
 }
 
 void EmbeddedWorkerInstance::OnStartWorkerMessageSent() {
   if (!step_time_.is_null()) {
     base::TimeDelta duration = UpdateStepTime();
@@ skipping 80 matching lines @@
   starting_phase_ = THREAD_STARTED;
   if (!step_time_.is_null()) {
     base::TimeDelta duration = UpdateStepTime();
     if (inflight_start_task_->is_installed())
       ServiceWorkerMetrics::RecordTimeToStartThread(duration, start_situation_);
   }
 
   thread_id_ = thread_id;
   FOR_EACH_OBSERVER(Listener, listener_list_, OnThreadStarted());
 
-  shell::mojom::InterfaceProviderPtr exposed_interfaces;
-  interface_registry_->Bind(GetProxy(&exposed_interfaces));
-  shell::mojom::InterfaceProviderPtr remote_interfaces;
-  shell::mojom::InterfaceProviderRequest request = GetProxy(&remote_interfaces);
-  remote_interfaces_->Bind(std::move(remote_interfaces));
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(SetupMojoOnUIThread, process_id(), thread_id_,
-                 base::Passed(&request),
-                 base::Passed(exposed_interfaces.PassInterface())));
+  if (!ServiceWorkerUtils::IsMojoForServiceWorkerEnabled()) {

[nhiroki, 2016/09/06 01:38:05]

This condition may make a code reader surprised because we set up mojo
interfaces even if IsMojoForServiceWorkerEnabled() returns *false*. Can you add
a comment why this is valid?

[shimazu, 2016/09/21 07:00:51]

Done.

+    shell::mojom::InterfaceProviderPtr exposed_interfaces;
+    interface_registry_->Bind(GetProxy(&exposed_interfaces));
+    shell::mojom::InterfaceProviderPtr remote_interfaces;
+    shell::mojom::InterfaceProviderRequest request =
+        GetProxy(&remote_interfaces);
+    remote_interfaces_->Bind(std::move(remote_interfaces));
+    BrowserThread::PostTask(
+        BrowserThread::UI, FROM_HERE,
+        base::Bind(SetupMojoOnUIThread, process_id(), thread_id_,
+                   base::Passed(&request),
+                   base::Passed(exposed_interfaces.PassInterface())));
+  }
 }
 
 void EmbeddedWorkerInstance::OnScriptLoadFailed() {
   if (!inflight_start_task_)
     return;
   TRACE_EVENT_ASYNC_STEP_PAST0("ServiceWorker", "EmbeddedWorkerInstance::Start",
                                inflight_start_task_.get(),
                                "OnScriptLoadFailed");
   FOR_EACH_OBSERVER(Listener, listener_list_, OnScriptLoadFailed());
 }
@@ skipping 42 matching lines @@
   EmbeddedWorkerStatus old_status = status_;
   ReleaseProcess();
   FOR_EACH_OBSERVER(Listener, listener_list_, OnDetached(old_status));
 }
 
 void EmbeddedWorkerInstance::Detach() {
   registry_->DetachWorker(process_id(), embedded_worker_id());
   OnDetached();
 }
 
+void EmbeddedWorkerInstance::BindMojoRequest(
+    mojom::EmbeddedWorkerInstanceRequest request) {
+  binding_.Bind(std::move(request));
+}
+
 base::WeakPtr<EmbeddedWorkerInstance> EmbeddedWorkerInstance::AsWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
+void EmbeddedWorkerInstance::AttachClientInterfaceProvider(
+    shell::mojom::InterfaceProviderPtr client_interfaces) {
+  remote_interfaces_->Bind(std::move(client_interfaces));
+}
+
 bool EmbeddedWorkerInstance::OnMessageReceived(const IPC::Message& message) {
   ListenerList::Iterator it(&listener_list_);
   while (Listener* listener = it.GetNext()) {
     if (listener->OnMessageReceived(message))
       return true;
   }
   return false;
 }
 
 void EmbeddedWorkerInstance::OnReportException(
@@ skipping 139 matching lines @@
     case SCRIPT_READ_FINISHED:
       return "Script read finished";
     case STARTING_PHASE_MAX_VALUE:
       NOTREACHED();
   }
   NOTREACHED() << phase;
   return std::string();
 }
 
 }  // namespace content