Call EmbeddedWorkerDevToolsManager::ServiceWorkerCreated, WorkerContextStarted and WorkerDestroyed.

content/browser/service_worker/embedded_worker_registry.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_registry.h"
 
 #include "base/bind_helpers.h"
 #include "base/stl_util.h"
-#include "content/browser/renderer_host/render_widget_helper.h"
 #include "content/browser/service_worker/embedded_worker_instance.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/common/service_worker/embedded_worker_messages.h"
+#include "content/common/service_worker/service_worker_messages.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/render_process_host.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_sender.h"
 
 namespace content {
 
 EmbeddedWorkerRegistry::EmbeddedWorkerRegistry(
     base::WeakPtr<ServiceWorkerContextCore> context)
     : context_(context),
       next_embedded_worker_id_(0) {}
 
@@ skipping 14 matching lines @@
     callback.Run(SERVICE_WORKER_ERROR_ABORT);
     return;
   }
   scoped_ptr<EmbeddedWorkerMsg_StartWorker_Params> params(
       new EmbeddedWorkerMsg_StartWorker_Params());
   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->worker_devtools_agent_route_id = MSG_ROUTING_NONE;
+  params->pause_on_start = false;
   context_->process_manager()->AllocateWorkerProcess(
       process_ids,
+      context_->storage()->path(),

[kinuko, 2014/05/02 08:55:47]

Getting path from storage() to allocate a process feels too mysterious, if what
we want here is an identifier of the storage partition we're in could we store
it in context_ (as a name, like, storage_partition_path) and use it instead?

Also as I commented on the other CL I don't think we will have same scope in
different storage partitions, and if it's true scope() will be enough..?

[horo, 2014/05/02 10:15:12]

Done.

+      scope,
       script_url,
       base::Bind(&EmbeddedWorkerRegistry::StartWorkerWithProcessId,
                  this,
-                 embedded_worker_id,
                  base::Passed(&params),
                  callback));
 }
 
 ServiceWorkerStatusCode EmbeddedWorkerRegistry::StopWorker(
     int process_id, int embedded_worker_id) {
   if (context_)
     context_->process_manager()->ReleaseWorkerProcess(process_id);
   return Send(process_id,
               new EmbeddedWorkerMsg_StopWorker(embedded_worker_id));
@@ skipping 127 matching lines @@
   if (found == worker_map_.end())
     return NULL;
   return found->second;
 }
 
 EmbeddedWorkerRegistry::~EmbeddedWorkerRegistry() {
   Shutdown();
 }
 
 void EmbeddedWorkerRegistry::StartWorkerWithProcessId(
-    int embedded_worker_id,
     scoped_ptr<EmbeddedWorkerMsg_StartWorker_Params> params,
     const StatusCallback& callback,
     ServiceWorkerStatusCode status,
-    int process_id) {
+    int process_id,
+    int worker_devtools_agent_route_id,
+    bool pause_on_start) {
   WorkerInstanceMap::const_iterator worker =
-      worker_map_.find(embedded_worker_id);
+      worker_map_.find(params->embedded_worker_id);
   if (worker == worker_map_.end()) {
     // The Instance was destroyed before it could finish starting.  Undo what
     // we've done so far.
     if (context_)
       context_->process_manager()->ReleaseWorkerProcess(process_id);
     callback.Run(SERVICE_WORKER_ERROR_ABORT);
     return;
   }
-  if (status == SERVICE_WORKER_OK) {
-    // Gets the new routing id for the renderer process.
-    scoped_refptr<RenderWidgetHelper> helper(
-        RenderWidgetHelper::FromProcessHostID(process_id));
-    // |helper| may be NULL in unittest.
-    params->worker_devtools_agent_route_id =
-        helper ? helper->GetNextRoutingID() : MSG_ROUTING_NONE;
-  }
   worker->second->RecordProcessId(
-      process_id, status, params->worker_devtools_agent_route_id);
+      process_id, status, worker_devtools_agent_route_id);
 
   if (status != SERVICE_WORKER_OK) {
     callback.Run(status);
     return;
   }
   // The ServiceWorkerDispatcherHost is supposed to be created when the process
   // is created, and keep an entry in process_sender_map_ for its whole
   // lifetime.
   DCHECK(ContainsKey(process_sender_map_, process_id));
+  params->worker_devtools_agent_route_id = worker_devtools_agent_route_id;
+  params->pause_on_start = pause_on_start;
   callback.Run(Send(process_id, new EmbeddedWorkerMsg_StartWorker(*params)));
 }
 
 ServiceWorkerStatusCode EmbeddedWorkerRegistry::Send(
     int process_id, IPC::Message* message) {
   if (!context_)
     return SERVICE_WORKER_ERROR_ABORT;
   ProcessToSenderMap::iterator found = process_sender_map_.find(process_id);
   if (found == process_sender_map_.end())
     return SERVICE_WORKER_ERROR_PROCESS_NOT_FOUND;
   if (!found->second->Send(message))
     return SERVICE_WORKER_ERROR_IPC_FAILED;
   return SERVICE_WORKER_OK;
 }
 
 void EmbeddedWorkerRegistry::RemoveWorker(int process_id,
                                           int embedded_worker_id) {
   DCHECK(ContainsKey(worker_map_, embedded_worker_id));
   worker_map_.erase(embedded_worker_id);
   worker_process_map_.erase(process_id);
 }
 
 }  // namespace content