WIP DO NOT COMMIT chromium side of navigator.connect

content/browser/message_port_service.h

Index: content/browser/message_port_service.h
diff --git a/content/browser/message_port_service.h b/content/browser/message_port_service.h
index 12ba53820c376996a53defa4b0d79be9bf32455c..eeee980438198a25e34a3c4f6a5fcc5aec3e97de 100644
--- a/content/browser/message_port_service.h
+++ b/content/browser/message_port_service.h
@@ -15,7 +15,7 @@
 #include "ipc/ipc_message.h"
 
 namespace content {
-class MessagePortMessageFilter;
+class MessagePortHandler;
 
 class MessagePortService {
  public:
@@ -26,9 +26,7 @@ class MessagePortService {
   static MessagePortService* GetInstance();
 
   // These methods correspond to the message port related IPCs.
-  void Create(int route_id,
-              MessagePortMessageFilter* filter,
-              int* message_port_id);
+  void Create(int route_id, MessagePortHandler* filter, int* message_port_id);
   void Destroy(int message_port_id);
   void Entangle(int local_message_port_id, int remote_message_port_id);
   void PostMessage(int sender_message_port_id,
@@ -41,10 +39,9 @@ class MessagePortService {
 
   // Updates the information needed to reach a message port when it's sent to a
   // (possibly different) process.
-  void UpdateMessagePort(
-      int message_port_id,
-      MessagePortMessageFilter* filter,
-      int routing_id);
+  void UpdateMessagePort(int message_port_id,
+                         MessagePortHandler* filter,
+                         int routing_id);
 
   // The message port is being transferred to a new renderer process, but the
   // code doing that isn't able to immediately update the message port with a
@@ -60,7 +57,7 @@ class MessagePortService {
   // Closes and cleans up the message port.
   void ClosePort(int message_port_id);
 
-  void OnMessagePortMessageFilterClosing(MessagePortMessageFilter* filter);
+  void OnMessagePortMessageFilterClosing(MessagePortHandler* filter);
 
   // Attempts to send the queued messages for a message port.
   void SendQueuedMessagesIfPossible(int message_port_id);