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/stl_util.h"
+#include "content/browser/devtools/shared_worker_devtools_manager.h"
 #include "content/browser/service_worker/embedded_worker_instance.h"
 #include "content/browser/service_worker/service_worker_context_core.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) {}
 
 scoped_ptr<EmbeddedWorkerInstance> EmbeddedWorkerRegistry::CreateWorker() {
   scoped_ptr<EmbeddedWorkerInstance> worker(
       new EmbeddedWorkerInstance(this, next_embedded_worker_id_));
   worker_map_[next_embedded_worker_id_++] = worker.get();
   return worker.Pass();
 }
 
 ServiceWorkerStatusCode EmbeddedWorkerRegistry::StartWorker(
     int process_id,
     int embedded_worker_id,
     int64 service_worker_version_id,
     const GURL& scope,
-    const GURL& script_url) {
-  return Send(
-      process_id,
-      new EmbeddedWorkerMsg_StartWorker(
-          embedded_worker_id, service_worker_version_id, scope, script_url));
+    const GURL& script_url,
+    int* worker_route_id) {
+  ProcessToNextRoutingIDCallbackMap::iterator found_callback =
+      process_next_id_callback_map_.find(process_id);
+  if (found_callback == process_next_id_callback_map_.end())
+    return SERVICE_WORKER_ERROR_PROCESS_NOT_FOUND;
+  *worker_route_id = found_callback->second.Run();
+  return Send(process_id,
+              new EmbeddedWorkerMsg_StartWorker(*worker_route_id,

[michaeln, 2014/04/25 02:53:15]

Can we not route/identify based on the existing embedded_worker_id_? I'm curious
about how this new id is used and why it has to be in the same process specific
id-space as that defined by MessagePortMessageFilter?

[horo, 2014/04/25 04:34:44]

I want to reuse the architecture of DevTools for SharedWorker.
And I want to use this worker_route_id to handle DevToolsClient messsages in
SharedWorkerDevToolsManager::SharedWorkerDevToolsAgentHost.
(I will rename these classes later.)
SharedWorkerDevToolsAgentHost is registered to RenderProcessHostImpl's
listeners_ with the route_id.
But if we can't use route_id for EmbeddedWorker, we have to route the message in
another way.

+                                                embedded_worker_id,
+                                                service_worker_version_id,
+                                                scope,
+                                                script_url));
 }
 
 ServiceWorkerStatusCode EmbeddedWorkerRegistry::StopWorker(
     int process_id, int embedded_worker_id) {
   return Send(process_id,
               new EmbeddedWorkerMsg_StopWorker(embedded_worker_id));
 }
 
 bool EmbeddedWorkerRegistry::OnMessageReceived(const IPC::Message& message) {
   // TODO(kinuko): Move all EmbeddedWorker message handling from
@@ skipping 80 matching lines @@
          it != worker_set.end();
          ++it) {
       int embedded_worker_id = *it;
       DCHECK(ContainsKey(worker_map_, embedded_worker_id));
       worker_map_[embedded_worker_id]->OnStopped();
     }
     worker_process_map_.erase(found);
   }
 }
 
+void EmbeddedWorkerRegistry::AddChildProcessNextRoutingIDCallback(
+    int process_id,
+    const base::Callback<int(void)>& callback) {
+  process_next_id_callback_map_.insert(std::make_pair(process_id, callback));
+}
+
+void EmbeddedWorkerRegistry::RemoveChildProcessNextRoutingIDCallback(
+    int process_id) {
+  process_next_id_callback_map_.erase(process_id);
+}
+
 EmbeddedWorkerInstance* EmbeddedWorkerRegistry::GetWorker(
     int embedded_worker_id) {
   WorkerInstanceMap::iterator found = worker_map_.find(embedded_worker_id);
   if (found == worker_map_.end())
     return NULL;
   return found->second;
 }
 
 EmbeddedWorkerRegistry::~EmbeddedWorkerRegistry() {}
 
@@ skipping 10 matching lines @@
 }
 
 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