HTML MessagePort as mojo::MessagePipeHandle

content/renderer/shared_worker/embedded_shared_worker_stub.h

 // Copyright 2014 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.
 
 #ifndef CONTENT_RENDERER_SHARED_WORKER_EMBEDDED_SHARED_WORKER_STUB_H_
 #define CONTENT_RENDERER_SHARED_WORKER_EMBEDDED_SHARED_WORKER_STUB_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 10 matching lines @@
 namespace blink {
 class WebApplicationCacheHost;
 class WebApplicationCacheHostClient;
 class WebNotificationPresenter;
 class WebSecurityOrigin;
 class WebSharedWorker;
 class WebWorkerContentSettingsClientProxy;
 }
 
 namespace content {
+class MessagePort;
 class SharedWorkerDevToolsAgent;
 class WebApplicationCacheHostImpl;
 class WebMessagePortChannelImpl;
 
 // A stub class to receive IPC from browser process and talk to
 // blink::WebSharedWorker. Implements blink::WebSharedWorkerClient.
 // This class is self-destruct (no one explicitly owns this), and
 // deletes itself (via private Shutdown() method) when either one of
 // following methods is called by blink::WebSharedWorker:
 // - workerScriptLoadFailed() or
@@ skipping 39 matching lines @@
   blink::WebDevToolsAgentClient::WebKitClientMessageLoop*
       createDevToolsMessageLoop() override;
 
  private:
   ~EmbeddedSharedWorkerStub() override;
 
   void Shutdown();
   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_;
   base::string16 name_;
   bool running_ = false;
   GURL url_;
   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_;
   WebApplicationCacheHostImpl* app_cache_host_ = nullptr;
   DISALLOW_COPY_AND_ASSIGN(EmbeddedSharedWorkerStub);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_SHARED_WORKER_EMBEDDED_SHARED_WORKER_STUB_H_