HTML MessagePort as mojo::MessagePipeHandle

content/renderer/shared_worker/embedded_shared_worker_stub.h

Index: content/renderer/shared_worker/embedded_shared_worker_stub.h
diff --git a/content/renderer/shared_worker/embedded_shared_worker_stub.h b/content/renderer/shared_worker/embedded_shared_worker_stub.h
index 3f0c25075fe7015a1d641aba209ef0717da4b079..80596461295ab441d55caed8d37f10aa013db754 100644
--- a/content/renderer/shared_worker/embedded_shared_worker_stub.h
+++ b/content/renderer/shared_worker/embedded_shared_worker_stub.h
@@ -28,6 +28,7 @@ class WebWorkerContentSettingsClientProxy;
 }
 
 namespace content {
+class MessagePort;
 class SharedWorkerDevToolsAgent;
 class WebApplicationCacheHostImpl;
 class WebMessagePortChannelImpl;
@@ -87,9 +88,11 @@ class EmbeddedSharedWorkerStub : public IPC::Listener,
   bool Send(IPC::Message* message);
 
   // WebSharedWorker will own |channel|.
-  void ConnectToChannel(WebMessagePortChannelImpl* channel);
+  void ConnectToChannel(int connection_request_id,
+                        WebMessagePortChannelImpl* channel);
 
-  void OnConnect(int sent_message_port_id, int routing_id);
+  void OnConnect(int connection_request_id,
+                 const MessagePort& sent_message_port);
   void OnTerminateWorkerContext();
 
   int route_id_;
@@ -99,7 +102,8 @@ class EmbeddedSharedWorkerStub : public IPC::Listener,
   blink::WebSharedWorker* impl_ = nullptr;
   std::unique_ptr<SharedWorkerDevToolsAgent> worker_devtools_agent_;
 
-  typedef std::vector<WebMessagePortChannelImpl*> PendingChannelList;
+  typedef std::vector<std::pair<int /* connection_request_id */,
+                                WebMessagePortChannelImpl*>> PendingChannelList;

[Ken Rockot(use gerrit already), 2017/01/23 23:20:42]

I think these should be unique_ptrs now, and we can explicitly release() them to
connect() and document that it takes ownership. I found the existing code quite
confusing to follow because the lifetime management of these objects is pretty
wacky.

   PendingChannelList pending_channels_;
 
   ScopedChildProcessReference process_ref_;