Refactor navigator.connect code to make it more flexible.

content/common/navigator_connect_messages.h

Index: content/common/navigator_connect_messages.h
diff --git a/content/common/navigator_connect_messages.h b/content/common/navigator_connect_messages.h
index 5871bb4f28dcb8ca8a8f589e311a7df977cad12c..4da2900922e81ccc7856f1d8c7ad6b7eafe97be0 100644
--- a/content/common/navigator_connect_messages.h
+++ b/content/common/navigator_connect_messages.h
@@ -4,13 +4,13 @@
 
 // IPC messages for navigator.connect
 
-#include "content/common/navigator_connect_types.h"
+#include "content/public/common/navigator_connect_client.h"
 #include "ipc/ipc_message_macros.h"
 #include "url/gurl.h"
 
 #define IPC_MESSAGE_START NavigatorConnectMsgStart
 
-IPC_STRUCT_TRAITS_BEGIN(content::CrossOriginServiceWorkerClient)
+IPC_STRUCT_TRAITS_BEGIN(content::NavigatorConnectClient)
   IPC_STRUCT_TRAITS_MEMBER(target_url)
   IPC_STRUCT_TRAITS_MEMBER(origin)
   IPC_STRUCT_TRAITS_MEMBER(message_port_id)
@@ -20,7 +20,7 @@ IPC_STRUCT_TRAITS_END()
 IPC_MESSAGE_CONTROL3(NavigatorConnectHostMsg_Connect,
                      int /* thread_id */,
                      int /* request_id */,
-                     content::CrossOriginServiceWorkerClient /* client */)
+                     content::NavigatorConnectClient /* client */)
 
 // Messages sent from the browser to the child process.
 IPC_MESSAGE_CONTROL3(NavigatorConnectMsg_ConnectResult,