HTML MessagePort as mojo::MessagePipeHandle

content/browser/shared_worker/shared_worker_service_impl.cc

Index: content/browser/shared_worker/shared_worker_service_impl.cc
diff --git a/content/browser/shared_worker/shared_worker_service_impl.cc b/content/browser/shared_worker/shared_worker_service_impl.cc
index 4524fd5bcc7c171b20d83613b264d2c62c43e555..1660c2c73e1a7b1a28497f4729ca7b5fc4e4af68 100644
--- a/content/browser/shared_worker/shared_worker_service_impl.cc
+++ b/content/browser/shared_worker/shared_worker_service_impl.cc
@@ -325,13 +325,12 @@ blink::WebWorkerCreationError SharedWorkerServiceImpl::CreateWorker(
 }
 
 void SharedWorkerServiceImpl::ConnectToWorker(SharedWorkerMessageFilter* filter,
-                                              int route_id,
-                                              int sent_message_port_id) {
+                                              int worker_route_id,
+                                              const MessagePort& port) {
   for (WorkerHostMap::const_iterator iter = worker_hosts_.begin();
        iter != worker_hosts_.end();
        ++iter) {
-    if (iter->second->FilterConnectionMessage(route_id, sent_message_port_id,
-                                              filter))
+    if (iter->second->SendConnectToWorker(worker_route_id, port, filter))
       return;
   }
 }
@@ -406,11 +405,11 @@ void SharedWorkerServiceImpl::WorkerScriptLoadFailed(
 }
 
 void SharedWorkerServiceImpl::WorkerConnected(SharedWorkerMessageFilter* filter,
-                                              int message_port_id,
+                                              int connection_request_id,
                                               int worker_route_id) {
   if (SharedWorkerHost* host =
           FindSharedWorkerHost(filter->render_process_id(), worker_route_id))
-    host->WorkerConnected(message_port_id);
+    host->WorkerConnected(connection_request_id);
 }
 
 void SharedWorkerServiceImpl::AllowFileSystem(SharedWorkerMessageFilter* filter,