Refactor navigator.connect code to make it more flexible.

content/child/navigator_connect/navigator_connect_provider.cc

Index: content/child/navigator_connect/navigator_connect_provider.cc
diff --git a/content/child/navigator_connect/navigator_connect_provider.cc b/content/child/navigator_connect/navigator_connect_provider.cc
index 04c3b808af375c040ae92970d477db3f8322aca4..c928097b4a03b2d12314e1b28c8a5a883a305336 100644
--- a/content/child/navigator_connect/navigator_connect_provider.cc
+++ b/content/child/navigator_connect/navigator_connect_provider.cc
@@ -10,7 +10,7 @@
 #include "content/child/thread_safe_sender.h"
 #include "content/child/webmessageportchannel_impl.h"
 #include "content/common/navigator_connect_messages.h"
-#include "content/common/navigator_connect_types.h"
+#include "content/public/common/navigator_connect_client.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 
 namespace content {
@@ -46,7 +46,7 @@ void SendConnectMessage(const scoped_refptr<ThreadSafeSender>& sender,
                         int message_port_id) {
   sender->Send(new NavigatorConnectHostMsg_Connect(
       thread_id, request_id,
-      CrossOriginServiceWorkerClient(target_url, origin, message_port_id)));
+      NavigatorConnectClient(target_url, origin, message_port_id)));
 }
 
 }  // namespace