HTML MessagePort as mojo::MessagePipeHandle

content/browser/shared_worker/shared_worker_message_filter.cc

Index: content/browser/shared_worker/shared_worker_message_filter.cc
diff --git a/content/browser/shared_worker/shared_worker_message_filter.cc b/content/browser/shared_worker/shared_worker_message_filter.cc
index ddc37450225a12d47870ba7631e4580083d367ec..454350ee2c5e47df7d63e8c1eb0841af98ce6950 100644
--- a/content/browser/shared_worker/shared_worker_message_filter.cc
+++ b/content/browser/shared_worker/shared_worker_message_filter.cc
@@ -7,7 +7,6 @@
 #include <stdint.h>
 
 #include "base/macros.h"
-#include "content/browser/message_port_message_filter.h"
 #include "content/browser/shared_worker/shared_worker_service_impl.h"
 #include "content/common/devtools_messages.h"
 #include "content/common/view_messages.h"
@@ -27,14 +26,13 @@ SharedWorkerMessageFilter::SharedWorkerMessageFilter(
     int render_process_id,
     ResourceContext* resource_context,
     const WorkerStoragePartition& partition,
-    MessagePortMessageFilter* message_port_message_filter)
+    const NextRoutingIDCallback& next_routing_id_callback)
     : BrowserMessageFilter(kFilteredMessageClasses,
                            arraysize(kFilteredMessageClasses)),
       render_process_id_(render_process_id),
       resource_context_(resource_context),
       partition_(partition),
-      message_port_message_filter_(message_port_message_filter) {
-}
+      next_routing_id_callback_(next_routing_id_callback) {}
 
 SharedWorkerMessageFilter::~SharedWorkerMessageFilter() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ -76,7 +74,7 @@ bool SharedWorkerMessageFilter::OnMessageReceived(const IPC::Message& message) {
 }
 
 int SharedWorkerMessageFilter::GetNextRoutingID() {
-  return message_port_message_filter_->GetNextRoutingID();
+  return next_routing_id_callback_.Run();
 }
 
 void SharedWorkerMessageFilter::OnCreateWorker(
@@ -88,10 +86,10 @@ void SharedWorkerMessageFilter::OnCreateWorker(
       WorkerStoragePartitionId(partition_));
 }
 
-void SharedWorkerMessageFilter::OnConnectToWorker(int route_id,
-                                                  int sent_message_port_id) {
-  SharedWorkerServiceImpl::GetInstance()->ConnectToWorker(
-      route_id, sent_message_port_id, this);
+void SharedWorkerMessageFilter::OnConnectToWorker(int worker_route_id,
+                                                  const MessagePort& port) {
+  SharedWorkerServiceImpl::GetInstance()->ConnectToWorker(worker_route_id, port,
+                                                          this);
 }
 
 void SharedWorkerMessageFilter::OnDocumentDetached(
@@ -127,12 +125,10 @@ void SharedWorkerMessageFilter::OnWorkerScriptLoadFailed(int worker_route_id) {
       this);
 }
 
-void SharedWorkerMessageFilter::OnWorkerConnected(int message_port_id,
+void SharedWorkerMessageFilter::OnWorkerConnected(int connection_request_id,
                                                   int worker_route_id) {
   SharedWorkerServiceImpl::GetInstance()->WorkerConnected(
-      message_port_id,
-      worker_route_id,
-      this);
+      connection_request_id, worker_route_id, this);
 }
 
 void SharedWorkerMessageFilter::OnRequestFileSystemAccess(