WIP attempt to replace StartWorker/StopWorker IPCs with a new mojo EmbeddedWorker service.

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 <algorithm>
 #include <utility>
 
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/trace_event/trace_event.h"
 #include "content/browser/devtools/service_worker_devtools_manager.h"
 #include "content/browser/service_worker/embedded_worker_registry.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/common/content_switches_internal.h"
 #include "content/common/mojo/service_registry_impl.h"
 #include "content/common/service_worker/embedded_worker_messages.h"
 #include "content/common/service_worker/embedded_worker_setup.mojom.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "ipc/ipc_message.h"
+#include "mojo/common/url_type_converters.h"
 #include "url/gurl.h"
 
 namespace content {
 
 namespace {
 
 // Functor to sort by the .second element of a struct.
 struct SecondGreater {
   template <typename Value>
   bool operator()(const Value& lhs, const Value& rhs) {
@@ skipping 13 matching lines @@
   ServiceWorkerDevToolsManager::GetInstance()->WorkerDestroyed(
       worker_process_id, worker_route_id);
 }
 
 void NotifyWorkerStopIgnoredOnUI(int worker_process_id, int worker_route_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   ServiceWorkerDevToolsManager::GetInstance()->WorkerStopIgnored(
       worker_process_id, worker_route_id);
 }
 
-void RegisterToWorkerDevToolsManagerOnUI(
+/*void RegisterToWorkerDevToolsManagerOnUI(
     int process_id,
     const ServiceWorkerContextCore* service_worker_context,
     const base::WeakPtr<ServiceWorkerContextCore>& service_worker_context_weak,
     int64 service_worker_version_id,
     const GURL& url,
     const base::Callback<void(int worker_devtools_agent_route_id,
                               bool wait_for_debugger)>& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   int worker_devtools_agent_route_id = MSG_ROUTING_NONE;
   bool wait_for_debugger = false;
   if (RenderProcessHost* rph = RenderProcessHost::FromID(process_id)) {
     // |rph| may be NULL in unit tests.
     worker_devtools_agent_route_id = rph->GetNextRoutingID();
     wait_for_debugger =
         ServiceWorkerDevToolsManager::GetInstance()->WorkerCreated(
             process_id,
             worker_devtools_agent_route_id,
             ServiceWorkerDevToolsManager::ServiceWorkerIdentifier(
                 service_worker_context,
                 service_worker_context_weak,
                 service_worker_version_id,
                 url));
   }
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(callback, worker_devtools_agent_route_id, wait_for_debugger));
 }
+*/
+void RegisterToWorkerDevToolsManagerAndConnectToWorkerOnUI(
+    int process_id,
+    const ServiceWorkerContextCore* service_worker_context,
+    const base::WeakPtr<ServiceWorkerContextCore>& service_worker_context_weak,
+    int64 service_worker_version_id,
+    const GURL& url,
+    mojo::InterfaceRequest<EmbeddedWorker> embedded_worker,
+    const base::Callback<void(int worker_devtools_agent_route_id,
+                              bool wait_for_debugger)>& callback) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  int worker_devtools_agent_route_id = MSG_ROUTING_NONE;
+  bool wait_for_debugger = false;
+  if (RenderProcessHost* rph = RenderProcessHost::FromID(process_id)) {
+    // |rph| may be NULL in unit tests.
+    worker_devtools_agent_route_id = rph->GetNextRoutingID();
+    wait_for_debugger =
+        ServiceWorkerDevToolsManager::GetInstance()->WorkerCreated(
+            process_id, worker_devtools_agent_route_id,
+            ServiceWorkerDevToolsManager::ServiceWorkerIdentifier(
+                service_worker_context, service_worker_context_weak,
+                service_worker_version_id, url));
+    rph->GetServiceRegistry()->ConnectToRemoteService(embedded_worker.Pass());
+  }
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      base::Bind(callback, worker_devtools_agent_route_id, wait_for_debugger));
+}
 
 void SetupMojoOnUIThread(int process_id,
                          int thread_id,
                          mojo::InterfaceRequest<mojo::ServiceProvider> services,
                          mojo::ServiceProviderPtr exposed_services) {
   RenderProcessHost* rph = RenderProcessHost::FromID(process_id);
   // |rph| may be NULL in unit tests.
   if (!rph)
     return;
   EmbeddedWorkerSetupPtr setup;
@@ skipping 58 matching lines @@
   if (!context_) {
     callback.Run(SERVICE_WORKER_ERROR_ABORT);
     return;
   }
   DCHECK(status_ == STOPPED);
   start_timing_ = base::TimeTicks::Now();
   status_ = STARTING;
   starting_phase_ = ALLOCATING_PROCESS;
   network_accessed_for_script_ = false;
   FOR_EACH_OBSERVER(Listener, listener_list_, OnStarting());
-  scoped_ptr<EmbeddedWorkerMsg_StartWorker_Params> params(
-      new EmbeddedWorkerMsg_StartWorker_Params());
+  EmbeddedWorkerStartWorkerParamsPtr params =
+      EmbeddedWorkerStartWorkerParams::New();
   TRACE_EVENT_ASYNC_BEGIN2("ServiceWorker",
                            "EmbeddedWorkerInstance::ProcessAllocate",
                            params.get(),
                            "Scope", scope.spec(),
                            "Script URL", script_url.spec());
   params->embedded_worker_id = embedded_worker_id_;
   params->service_worker_version_id = service_worker_version_id;
-  params->scope = scope;
-  params->script_url = script_url;
+  params->scope = mojo::String::From(scope);
+  params->script_url = mojo::String::From(script_url);
   params->worker_devtools_agent_route_id = MSG_ROUTING_NONE;
   params->wait_for_debugger = false;
   params->v8_cache_options = GetV8CacheOptions();
   context_->process_manager()->AllocateWorkerProcess(
-      embedded_worker_id_,
-      scope,
-      script_url,
+      embedded_worker_id_, scope, script_url,
       base::Bind(&EmbeddedWorkerInstance::RunProcessAllocated,
-                 weak_factory_.GetWeakPtr(),
-                 context_,
-                 base::Passed(&params),
+                 weak_factory_.GetWeakPtr(), context_, base::Passed(&params),
                  callback));
 }
 
 ServiceWorkerStatusCode EmbeddedWorkerInstance::Stop() {
   DCHECK(status_ == STARTING || status_ == RUNNING) << status_;
-  ServiceWorkerStatusCode status =
-      registry_->StopWorker(process_id_, embedded_worker_id_);
+  ServiceWorkerStatusCode status = SERVICE_WORKER_OK;
+  //      registry_->StopWorker(process_id_, embedded_worker_id_);
+  worker_.reset();
   // StopWorker could fail if we can't talk to the worker, which should
   // basically means it's being terminated, so unconditionally change
   // the status to STOPPING.
   status_ = STOPPING;
   FOR_EACH_OBSERVER(Listener, listener_list_, OnStopping());
   return status;
 }
 
 void EmbeddedWorkerInstance::StopIfIdle() {
   if (devtools_attached_) {
@@ skipping 30 matching lines @@
       thread_id_(kInvalidEmbeddedWorkerThreadId),
       devtools_attached_(false),
       network_accessed_for_script_(false),
       weak_factory_(this) {
 }
 
 // static
 void EmbeddedWorkerInstance::RunProcessAllocated(
     base::WeakPtr<EmbeddedWorkerInstance> instance,
     base::WeakPtr<ServiceWorkerContextCore> context,
-    scoped_ptr<EmbeddedWorkerMsg_StartWorker_Params> params,
+    EmbeddedWorkerStartWorkerParamsPtr params,
     const EmbeddedWorkerInstance::StatusCallback& callback,
     ServiceWorkerStatusCode status,
     int process_id,
     bool is_new_process) {
   if (!context) {
     callback.Run(SERVICE_WORKER_ERROR_ABORT);
     return;
   }
   if (!instance) {
     if (status == SERVICE_WORKER_OK) {
       // We only have a process allocated if the status is OK.
       context->process_manager()->ReleaseWorkerProcess(
           params->embedded_worker_id);
     }
     callback.Run(SERVICE_WORKER_ERROR_ABORT);
     return;
   }
   instance->ProcessAllocated(params.Pass(), callback, process_id,
                              is_new_process, status);
 }
 
 void EmbeddedWorkerInstance::ProcessAllocated(
-    scoped_ptr<EmbeddedWorkerMsg_StartWorker_Params> params,
+    EmbeddedWorkerStartWorkerParamsPtr params,
     const StatusCallback& callback,
     int process_id,
     bool is_new_process,
     ServiceWorkerStatusCode status) {
   DCHECK_EQ(process_id_, -1);
   TRACE_EVENT_ASYNC_END1("ServiceWorker",
                          "EmbeddedWorkerInstance::ProcessAllocate",
                          params.get(),
                          "Status", status);
   if (status != SERVICE_WORKER_OK) {
     Status old_status = status_;
     status_ = STOPPED;
     callback.Run(status);
     FOR_EACH_OBSERVER(Listener, listener_list_, OnStopped(old_status));
     return;
   }
   const int64 service_worker_version_id = params->service_worker_version_id;
   process_id_ = process_id;
   GURL script_url(params->script_url);
 
   // Register this worker to DevToolsManager on UI thread, then continue to
   // call SendStartWorker on IO thread.
   starting_phase_ = REGISTERING_TO_DEVTOOLS;
+  mojo::InterfaceRequest<EmbeddedWorker> request = mojo::GetProxy(&worker_);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      base::Bind(RegisterToWorkerDevToolsManagerOnUI, process_id_,
-                 context_.get(), context_, service_worker_version_id,
-                 script_url,
+      base::Bind(RegisterToWorkerDevToolsManagerAndConnectToWorkerOnUI,
+                 process_id_, context_.get(), context_,
+                 service_worker_version_id, script_url, base::Passed(&request),
                  base::Bind(&EmbeddedWorkerInstance::SendStartWorker,
                             weak_factory_.GetWeakPtr(), base::Passed(&params),
                             callback, is_new_process)));
 }
 
 void EmbeddedWorkerInstance::SendStartWorker(
-    scoped_ptr<EmbeddedWorkerMsg_StartWorker_Params> params,
+    EmbeddedWorkerStartWorkerParamsPtr params,
     const StatusCallback& callback,
     bool is_new_process,
     int worker_devtools_agent_route_id,
     bool wait_for_debugger) {
   if (worker_devtools_agent_route_id != MSG_ROUTING_NONE) {
     DCHECK(!devtools_proxy_);
-    devtools_proxy_.reset(new DevToolsProxy(process_id_,
-                                            worker_devtools_agent_route_id));
+    devtools_proxy_.reset(
+        new DevToolsProxy(process_id_, worker_devtools_agent_route_id));
   }
   params->worker_devtools_agent_route_id = worker_devtools_agent_route_id;
   params->wait_for_debugger = wait_for_debugger;
   if (params->wait_for_debugger) {
     // We don't measure the start time when wait_for_debugger flag is set. So we
     // set the NULL time here.
     start_timing_ = base::TimeTicks();
   } else {
     DCHECK(!start_timing_.is_null());
     if (is_new_process) {
       UMA_HISTOGRAM_TIMES("EmbeddedWorkerInstance.NewProcessAllocation",
                           base::TimeTicks::Now() - start_timing_);
     } else {
       UMA_HISTOGRAM_TIMES("EmbeddedWorkerInstance.ExistingProcessAllocation",
                           base::TimeTicks::Now() - start_timing_);
     }
     UMA_HISTOGRAM_BOOLEAN("EmbeddedWorkerInstance.ProcessCreated",
                           is_new_process);
     // Reset |start_timing_| to measure the time excluding the process
     // allocation time.
     start_timing_ = base::TimeTicks::Now();
   }
 
   starting_phase_ = SENT_START_WORKER;
-  ServiceWorkerStatusCode status =
-      registry_->SendStartWorker(params.Pass(), process_id_);
-  if (status != SERVICE_WORKER_OK) {
-    callback.Run(status);
-    return;
-  }
+  registry_->WorkerStarting(embedded_worker_id_, process_id_);
+  worker_->Initialize(params.Pass());
   DCHECK(start_callback_.is_null());
   start_callback_ = callback;
 }
 
 void EmbeddedWorkerInstance::OnReadyForInspection() {
   if (devtools_proxy_)
     devtools_proxy_->NotifyWorkerReadyForInspection();
 }
 
 void EmbeddedWorkerInstance::OnScriptLoaded(int thread_id) {
@@ skipping 169 matching lines @@
     case SCRIPT_EVALUATED:
       return "Script evaluated";
     case STARTING_PHASE_MAX_VALUE:
       NOTREACHED();
   }
   NOTREACHED() << phase;
   return std::string();
 }
 
 }  // namespace content