Introduce worker_devtools_agent_route_id for EmbeddedWorker.

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/public/browser/browser_thread.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_sender.h"
 
 namespace content {
 
@@ skipping 12 matching lines @@
 void EmbeddedWorkerRegistry::StartWorker(const std::vector<int>& process_ids,
                                          int embedded_worker_id,
                                          int64 service_worker_version_id,
                                          const GURL& scope,
                                          const GURL& script_url,
                                          const StatusCallback& callback) {
   if (!context_) {
     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;
   context_->process_manager()->AllocateWorkerProcess(
       process_ids,
       script_url,
       base::Bind(&EmbeddedWorkerRegistry::StartWorkerWithProcessId,
                  this,
                  embedded_worker_id,
-                 base::Passed(make_scoped_ptr(new EmbeddedWorkerMsg_StartWorker(
-                     embedded_worker_id,
-                     service_worker_version_id,
-                     scope,
-                     script_url))),
+                 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 105 matching lines @@
     return NULL;
   return found->second;
 }
 
 EmbeddedWorkerRegistry::~EmbeddedWorkerRegistry() {
   Shutdown();
 }
 
 void EmbeddedWorkerRegistry::StartWorkerWithProcessId(
     int embedded_worker_id,
-    scoped_ptr<EmbeddedWorkerMsg_StartWorker> message,
+    scoped_ptr<EmbeddedWorkerMsg_StartWorker_Params> params,
     const StatusCallback& callback,
     ServiceWorkerStatusCode status,
     int process_id) {
   WorkerInstanceMap::const_iterator worker =
       worker_map_.find(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;
   }
-  worker->second->RecordProcessId(process_id, status);
+  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);
 
   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));
-  callback.Run(Send(process_id, message.release()));
+  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