HTML MessagePort as mojo::MessagePipeHandle

content/browser/shared_worker/shared_worker_message_filter.h

Index: content/browser/shared_worker/shared_worker_message_filter.h
diff --git a/content/browser/shared_worker/shared_worker_message_filter.h b/content/browser/shared_worker/shared_worker_message_filter.h
index a43a9a6f116281b9a9653d248a192b3af625ae26..2e2626d7d3685e9abff9eea05e817aa063447f35 100644
--- a/content/browser/shared_worker/shared_worker_message_filter.h
+++ b/content/browser/shared_worker/shared_worker_message_filter.h
@@ -15,17 +15,18 @@ struct ViewHostMsg_CreateWorker_Params;
 struct ViewHostMsg_CreateWorker_Reply;
 
 namespace content {
-class MessagePortMessageFilter;
 class ResourceContext;
 
 // Handles SharedWorker related IPC messages for one renderer process by
 // forwarding them to the SharedWorkerServiceImpl singleton.
 class CONTENT_EXPORT SharedWorkerMessageFilter : public BrowserMessageFilter {
  public:
+  typedef base::Callback<int(void)> NextRoutingIDCallback;
+
   SharedWorkerMessageFilter(int render_process_id,
                             ResourceContext* resource_context,
                             const WorkerStoragePartition& partition,
-                            MessagePortMessageFilter* message_port_filter);
+                            const NextRoutingIDCallback& callback);
 
   // BrowserMessageFilter implementation.
   void OnChannelClosing() override;
@@ -34,10 +35,6 @@ class CONTENT_EXPORT SharedWorkerMessageFilter : public BrowserMessageFilter {
   int GetNextRoutingID();
   int render_process_id() const { return render_process_id_; }
 
-  MessagePortMessageFilter* message_port_message_filter() const {
-    return message_port_message_filter_;
-  }
-
  protected:
   // This is protected, so we can define sub classes for testing.
   ~SharedWorkerMessageFilter() override;
@@ -57,7 +54,7 @@ class CONTENT_EXPORT SharedWorkerMessageFilter : public BrowserMessageFilter {
   const int render_process_id_;
   ResourceContext* const resource_context_;
   const WorkerStoragePartition partition_;
-  MessagePortMessageFilter* const message_port_message_filter_;
+  NextRoutingIDCallback next_routing_id_callback_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(SharedWorkerMessageFilter);
 };