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 2bdc277d333cdd34371a5779a9fa4a3e86d9ebaf..cd4a772881bf90f3e4faac354a72cfa157e1ed9e 100644
--- a/content/browser/shared_worker/shared_worker_service_impl.cc
+++ b/content/browser/shared_worker/shared_worker_service_impl.cc
@@ -325,14 +325,13 @@ blink::WebWorkerCreationError SharedWorkerServiceImpl::CreateWorker(
 }
 
 void SharedWorkerServiceImpl::ConnectToWorker(
-    int route_id,
-    int sent_message_port_id,
+    int worker_route_id,
+    const MessagePort& port,
     SharedWorkerMessageFilter* filter) {
   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;
   }
 }
@@ -394,12 +393,12 @@ void SharedWorkerServiceImpl::WorkerScriptLoadFailed(
 }
 
 void SharedWorkerServiceImpl::WorkerConnected(
-    int message_port_id,
+    int connection_request_id,
     int worker_route_id,
     SharedWorkerMessageFilter* filter) {
   if (SharedWorkerHost* host =
           FindSharedWorkerHost(filter->render_process_id(), worker_route_id))
-    host->WorkerConnected(message_port_id);
+    host->WorkerConnected(connection_request_id);
 }
 
 void SharedWorkerServiceImpl::AllowFileSystem(