Introduce worker_devtools_agent_route_id for EmbeddedWorker.

content/browser/renderer_host/render_process_host_impl.cc

 // Copyright (c) 2012 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.
 
 // Represents the browser side of the browser <--> renderer communication
 // channel. There will be one RenderProcessHost per renderer process.
 
 #include "content/browser/renderer_host/render_process_host_impl.h"
 
 #include <algorithm>
@@ skipping 744 matching lines @@
       new WebSocketDispatcherHost(GetID(), websocket_request_context_callback));
 
   message_port_message_filter_ = new MessagePortMessageFilter(
       base::Bind(&RenderWidgetHelper::GetNextRoutingID,
                  base::Unretained(widget_helper_.get())));
   AddFilter(message_port_message_filter_);
 
   scoped_refptr<ServiceWorkerDispatcherHost> service_worker_filter =
       new ServiceWorkerDispatcherHost(GetID(), message_port_message_filter_);
   service_worker_filter->Init(
-      storage_partition_impl_->GetServiceWorkerContext());
+      storage_partition_impl_->GetServiceWorkerContext(),
+      base::Bind(&RenderWidgetHelper::GetNextRoutingID, widget_helper_));

[michaeln, 2014/04/25 19:29:50]

ah... this is nice

[michaeln, 2014/04/25 20:10:34]

Here's a thought? Define a new static method and nix the abstraction layer by
way of bind closure and map book keeping. Less and more understandable code.
Wdyt?

// static
int RenderProcessHostImpl::GetNextRouteIDForProcess(process_id)  {
  RenderWidgetHelper* helper =
RenderWidgetHelper::FromProcessHostID(process_id);
  if (!helper)
    return -1;  // Maybe null in unittest.
  return helper->GetNextRoutingID();
}

   AddFilter(service_worker_filter);
 
   // If "--enable-embedded-shared-worker" is set, we use
   // SharedWorkerMessageFilter in stead of WorkerMessageFilter.
   if (WorkerService::EmbeddedSharedWorkerEnabled()) {
     AddFilter(new SharedWorkerMessageFilter(
         GetID(),
         resource_context,
         WorkerStoragePartition(
             storage_partition_impl_->GetURLRequestContext(),
@@ skipping 1288 matching lines @@
     mojo::ScopedMessagePipeHandle handle) {
   if (!mojo_application_host_->did_activate())
     mojo_application_host_->Activate(this, GetHandle());
 
   mojo::AllocationScope scope;
   mojo_application_host_->shell_client()->AcceptConnection(service_name,
                                                            handle.Pass());
 }
 
 }  // namespace content