Remove InterfaceRegistry/Provider from service workers

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 11 matching lines @@
 #include "content/common/service_worker/embedded_worker_setup.mojom.h"
 #include "content/common/service_worker/embedded_worker_start_params.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "content/common/service_worker/service_worker_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/child_process_host.h"
 #include "content/public/common/content_switches.h"
 #include "ipc/ipc_message.h"
-#include "services/service_manager/public/cpp/interface_provider.h"
-#include "services/service_manager/public/cpp/interface_registry.h"
 #include "url/gurl.h"
 
 namespace content {
 
 namespace {
 
 // When a service worker version's failure count exceeds
 // |kMaxSameProcessFailureCount|, the embedded worker is forced to start in a
 // new process.
 const int kMaxSameProcessFailureCount = 2;
@@ skipping 54 matching lines @@
             is_installed);
     if (request.is_pending())
       rph->GetRemoteInterfaces()->GetInterface(std::move(request));
   }
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(callback, worker_devtools_agent_route_id, wait_for_debugger));
 }
 
-void SetupMojoOnUIThread(
+void SetupEventDispatcherOnUIThread(
     int process_id,
     int thread_id,
-    service_manager::mojom::InterfaceProviderRequest remote_interfaces,
-    service_manager::mojom::InterfaceProviderPtrInfo exposed_interfaces) {
+    mojom::ServiceWorkerEventDispatcherRequest request) {
+  DCHECK(!ServiceWorkerUtils::IsMojoForServiceWorkerEnabled());
   RenderProcessHost* rph = RenderProcessHost::FromID(process_id);
   // |rph| or its InterfaceProvider may be NULL in unit tests.
   if (!rph || !rph->GetRemoteInterfaces())
     return;
   mojom::EmbeddedWorkerSetupPtr setup;
   rph->GetRemoteInterfaces()->GetInterface(&setup);
-  setup->ExchangeInterfaceProviders(
-      thread_id, std::move(remote_interfaces),
-      mojo::MakeProxy(std::move(exposed_interfaces)));
+  setup->AttachServiceWorkerEventDispatcher(thread_id, std::move(request));
 }
 
 void CallDetach(EmbeddedWorkerInstance* instance) {
   // This could be called on the UI thread if |client_| still be valid when the
   // message loop on the UI thread gets destructed.
   // TODO(shimazu): Remove this after https://crbug.com/604762 is fixed
   if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
     DCHECK(ServiceWorkerUtils::IsMojoForServiceWorkerEnabled());
     return;
   }
@@ skipping 140 matching lines @@
     // requests in the queue. See ServiceWorkerVersion::OnStoppedInternal() for
     // details.
     // TODO(nhiroki): Reconsider this bizarre layering.
   }
 
   void Start(std::unique_ptr<EmbeddedWorkerStartParams> params,
              const StatusCallback& callback) {
     DCHECK_CURRENTLY_ON(BrowserThread::IO);
     state_ = ProcessAllocationState::ALLOCATING;
     start_callback_ = callback;
-    is_installed_ = params->is_installed;
+    is_installed_ = params->internal.is_installed;
 
     if (!GetContentClient()->browser()->IsBrowserStartupComplete())
       started_during_browser_startup_ = true;
 
-    GURL scope(params->scope);
-    GURL script_url(params->script_url);
+    GURL scope(params->internal.scope);
+    GURL script_url(params->internal.script_url);
 
     bool can_use_existing_process =
         instance_->context_->GetVersionFailureCount(
-            params->service_worker_version_id) < kMaxSameProcessFailureCount;
+            params->internal.service_worker_version_id) <
+        kMaxSameProcessFailureCount;
     instance_->context_->process_manager()->AllocateWorkerProcess(
         instance_->embedded_worker_id_, scope, script_url,
         can_use_existing_process,
         base::Bind(&StartTask::OnProcessAllocated, weak_factory_.GetWeakPtr(),
                    base::Passed(&params)));
   }
 
   static void RunStartCallback(StartTask* task,
                                ServiceWorkerStatusCode status) {
     DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ skipping 43 matching lines @@
     // Notify the instance that a process is allocated.
     state_ = ProcessAllocationState::ALLOCATED;
     instance_->OnProcessAllocated(
         base::MakeUnique<WorkerProcessHandle>(instance_->context_,
                                               instance_->embedded_worker_id(),
                                               process_id, is_new_process),
         start_situation);
 
     // TODO(bengr): Support changes to this setting while the worker
     // is running.
-    params->settings.data_saver_enabled = settings.data_saver_enabled;
+    params->internal.settings.data_saver_enabled = settings.data_saver_enabled;
 
     // Register the instance to DevToolsManager on UI thread.
-    const int64_t service_worker_version_id = params->service_worker_version_id;
-    const GURL& scope = params->scope;
-    GURL script_url(params->script_url);
+    const int64_t service_worker_version_id =
+        params->internal.service_worker_version_id;
+    const GURL& scope = params->internal.scope;
+    GURL script_url(params->internal.script_url);
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&SetupOnUI, process_id, instance_->context_.get(),
                    instance_->context_, service_worker_version_id, script_url,
                    scope, is_installed_, base::Passed(&request_),
                    base::Bind(&StartTask::OnSetupOnUICompleted,
                               weak_factory_.GetWeakPtr(), base::Passed(&params),
                               is_new_process)));
   }
 
   void OnSetupOnUICompleted(std::unique_ptr<EmbeddedWorkerStartParams> params,
                             bool is_new_process,
                             int worker_devtools_agent_route_id,
                             bool wait_for_debugger) {
     DCHECK_CURRENTLY_ON(BrowserThread::IO);
     TRACE_EVENT_ASYNC_STEP_PAST0("ServiceWorker",
                                  "EmbeddedWorkerInstance::Start", this,
                                  "OnSetupOnUICompleted");
 
     // Notify the instance that it is registered to the devtools manager.
     instance_->OnRegisteredToDevToolsManager(
         is_new_process, worker_devtools_agent_route_id, wait_for_debugger);
 
-    params->worker_devtools_agent_route_id = worker_devtools_agent_route_id;
-    params->wait_for_debugger = wait_for_debugger;
+    params->internal.worker_devtools_agent_route_id =
+        worker_devtools_agent_route_id;
+    params->internal.wait_for_debugger = wait_for_debugger;
 
     if (ServiceWorkerUtils::IsMojoForServiceWorkerEnabled())
       SendMojoStartWorker(std::move(params));
     else
       SendStartWorker(std::move(params));
   }
 
   void SendStartWorker(std::unique_ptr<EmbeddedWorkerStartParams> params) {
     DCHECK_CURRENTLY_ON(BrowserThread::IO);
     ServiceWorkerStatusCode status = instance_->registry_->SendStartWorker(
@@ skipping 53 matching lines @@
 EmbeddedWorkerInstance::~EmbeddedWorkerInstance() {
   DCHECK(status_ == EmbeddedWorkerStatus::STOPPING ||
          status_ == EmbeddedWorkerStatus::STOPPED)
       << static_cast<int>(status_);
   devtools_proxy_.reset();
   if (registry_->GetWorker(embedded_worker_id_))
     registry_->RemoveWorker(process_id(), embedded_worker_id_);
   process_handle_.reset();
 }
 
 void EmbeddedWorkerInstance::Start(

[horo, 2016/11/11 02:17:27]

I think this approach is a bit confusing.
"EmbeddedWorkerStartParams = EmbeddedWorkerStartParamsInternal +
                             mojom::ServiceWorkerEventDispatcherRequest"

How about adding mojom::ServiceWorkerEventDispatcherRequest to the arguments of
EmbeddedWorkerInstance::Start()?
  void EmbeddedWorkerInstance::Start(
      std::unique_ptr<EmbeddedWorkerStartParams> params,
      mojom::ServiceWorkerEventDispatcherRequest dispatcher_request,
      const StatusCallback& callback) {}

[shimazu, 2016/11/17 22:23:38]

Done.

     std::unique_ptr<EmbeddedWorkerStartParams> params,
     const StatusCallback& callback) {
   if (!context_) {
     callback.Run(SERVICE_WORKER_ERROR_ABORT);
     // |this| may be destroyed by the callback.
     return;
   }
   DCHECK(status_ == EmbeddedWorkerStatus::STOPPED);
 
-  DCHECK(!params->pause_after_download || !params->is_installed);
-  DCHECK_NE(kInvalidServiceWorkerVersionId, params->service_worker_version_id);
+  EmbeddedWorkerStartParamsInternal* internal = &params->internal;
+  DCHECK(!internal->pause_after_download || !internal->is_installed);
+  DCHECK_NE(kInvalidServiceWorkerVersionId,
+            internal->service_worker_version_id);
   step_time_ = base::TimeTicks::Now();
   status_ = EmbeddedWorkerStatus::STARTING;
   starting_phase_ = ALLOCATING_PROCESS;
   network_accessed_for_script_ = false;
-  interface_registry_ =
-      base::MakeUnique<service_manager::InterfaceRegistry>(std::string());
-  remote_interfaces_.reset(new service_manager::InterfaceProvider);
   for (auto& observer : listener_list_)
     observer.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();
+  internal->embedded_worker_id = embedded_worker_id_;
+  internal->worker_devtools_agent_route_id = MSG_ROUTING_NONE;
+  internal->wait_for_debugger = false;
+  internal->settings.v8_cache_options = GetV8CacheOptions();
 
   mojom::EmbeddedWorkerInstanceClientRequest request;
   if (ServiceWorkerUtils::IsMojoForServiceWorkerEnabled()) {
     request = mojo::GetProxy(&client_);
     client_.set_connection_error_handler(
         base::Bind(&CallDetach, base::Unretained(this)));
   }
 
+  if (!ServiceWorkerUtils::IsMojoForServiceWorkerEnabled())
+    pending_dispatcher_request_ = std::move(params->dispatcher_request);
+
   inflight_start_task_.reset(
-      new StartTask(this, params->script_url, std::move(request)));
+      new StartTask(this, internal->script_url, std::move(request)));
   inflight_start_task_->Start(std::move(params), callback);
 }
 
 ServiceWorkerStatusCode EmbeddedWorkerInstance::Stop() {
   DCHECK(status_ == EmbeddedWorkerStatus::STARTING ||
          status_ == EmbeddedWorkerStatus::RUNNING)
       << static_cast<int>(status_);
 
   // Abort an inflight start task.
   inflight_start_task_.reset();
@@ skipping 52 matching lines @@
 
 void EmbeddedWorkerInstance::ResumeAfterDownload() {
   if (process_id() == ChildProcessHost::kInvalidUniqueID ||
       status_ != EmbeddedWorkerStatus::STARTING) {
     return;
   }
   registry_->Send(process_id(), new EmbeddedWorkerMsg_ResumeAfterDownload(
                                     embedded_worker_id_));
 }
 
-service_manager::InterfaceRegistry*
-EmbeddedWorkerInstance::GetInterfaceRegistry() {
-  DCHECK(status_ == EmbeddedWorkerStatus::STARTING ||
-         status_ == EmbeddedWorkerStatus::RUNNING)
-      << static_cast<int>(status_);
-  return interface_registry_.get();
-}
-
-service_manager::InterfaceProvider*
-EmbeddedWorkerInstance::GetRemoteInterfaces() {
-  DCHECK(status_ == EmbeddedWorkerStatus::STARTING ||
-         status_ == EmbeddedWorkerStatus::RUNNING)
-      << static_cast<int>(status_);
-  return remote_interfaces_.get();
-}
-
 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),
       devtools_attached_(false),
@@ skipping 28 matching lines @@
     step_time_ = base::TimeTicks();
   }
   for (auto& observer : listener_list_)
     observer.OnRegisteredToDevToolsManager();
 }
 
 ServiceWorkerStatusCode EmbeddedWorkerInstance::SendMojoStartWorker(
     std::unique_ptr<EmbeddedWorkerStartParams> params) {
   if (!context_)
     return SERVICE_WORKER_ERROR_ABORT;
-  service_manager::mojom::InterfaceProviderPtr remote_interfaces;
-  service_manager::mojom::InterfaceProviderRequest request =
-      mojo::GetProxy(&remote_interfaces);
-  remote_interfaces_->Bind(std::move(remote_interfaces));
-  service_manager::mojom::InterfaceProviderPtr exposed_interfaces;
-  interface_registry_->Bind(
-      mojo::GetProxy(&exposed_interfaces), service_manager::Identity(),
-      service_manager::InterfaceProviderSpec(), service_manager::Identity(),
-      service_manager::InterfaceProviderSpec());
-  client_->StartWorker(*params, std::move(exposed_interfaces),
-                       std::move(request));
+  client_->StartWorker(params->internal, std::move(params->dispatcher_request));
   registry_->BindWorkerToProcess(process_id(), embedded_worker_id());
   TRACE_EVENT_ASYNC_STEP_PAST1("ServiceWorker", "EmbeddedWorkerInstance::Start",
                                this, "SendStartWorker", "Status", "mojo");
   OnStartWorkerMessageSent();
   return SERVICE_WORKER_OK;
 }
 
 void EmbeddedWorkerInstance::OnStartWorkerMessageSent() {
   if (!step_time_.is_null()) {
     base::TimeDelta duration = UpdateStepTime();
@@ skipping 83 matching lines @@
   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 (auto& observer : listener_list_)
     observer.OnThreadStarted();
 
-  // This code is for BackgroundSync and FetchEvent, which have been already
-  // mojofied. Interfaces are exchanged at StartWorker when mojo for the service
-  // worker is enabled, so this code isn't necessary when the flag is enabled.
+  // The pending request is sent at StartWorker if mojo for the service worker
+  // is enabled.
   if (!ServiceWorkerUtils::IsMojoForServiceWorkerEnabled()) {
-    service_manager::mojom::InterfaceProviderPtr exposed_interfaces;
-    interface_registry_->Bind(
-        mojo::GetProxy(&exposed_interfaces), service_manager::Identity(),
-        service_manager::InterfaceProviderSpec(), service_manager::Identity(),
-        service_manager::InterfaceProviderSpec());
-    service_manager::mojom::InterfaceProviderPtr remote_interfaces;
-    service_manager::mojom::InterfaceProviderRequest request =
-        mojo::GetProxy(&remote_interfaces);
-    remote_interfaces_->Bind(std::move(remote_interfaces));
+    DCHECK(pending_dispatcher_request_.is_pending());
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
-        base::Bind(SetupMojoOnUIThread, process_id(), thread_id_,
-                   base::Passed(&request),
-                   base::Passed(exposed_interfaces.PassInterface())));
+        base::Bind(SetupEventDispatcherOnUIThread, process_id(), thread_id_,
+                   base::Passed(&pending_dispatcher_request_)));
   }
 }
 
 void EmbeddedWorkerInstance::OnScriptLoadFailed() {
   if (!inflight_start_task_)
     return;
   TRACE_EVENT_ASYNC_STEP_PAST0("ServiceWorker", "EmbeddedWorkerInstance::Start",
                                inflight_start_task_.get(),
                                "OnScriptLoadFailed");
   for (auto& observer : listener_list_)
@@ skipping 126 matching lines @@
 
 void EmbeddedWorkerInstance::ReleaseProcess() {
   // Abort an inflight start task.
   inflight_start_task_.reset();
 
   client_.reset();
   devtools_proxy_.reset();
   process_handle_.reset();
   status_ = EmbeddedWorkerStatus::STOPPED;
   thread_id_ = kInvalidEmbeddedWorkerThreadId;
-  interface_registry_.reset();
-  remote_interfaces_.reset();
 }
 
 void EmbeddedWorkerInstance::OnStartFailed(const StatusCallback& callback,
                                            ServiceWorkerStatusCode status) {
   EmbeddedWorkerStatus old_status = status_;
   ReleaseProcess();
   base::WeakPtr<EmbeddedWorkerInstance> weak_this = weak_factory_.GetWeakPtr();
   callback.Run(status);
   if (weak_this && old_status != EmbeddedWorkerStatus::STOPPED) {
     for (auto& observer : weak_this->listener_list_)
@@ skipping 61 matching lines @@
     case SCRIPT_READ_FINISHED:
       return "Script read finished";
     case STARTING_PHASE_MAX_VALUE:
       NOTREACHED();
   }
   NOTREACHED() << phase;
   return std::string();
 }
 
 }  // namespace content