Refactor navigator.connect code to make it more flexible.

content/renderer/service_worker/service_worker_script_context.h

Index: content/renderer/service_worker/service_worker_script_context.h
diff --git a/content/renderer/service_worker/service_worker_script_context.h b/content/renderer/service_worker/service_worker_script_context.h
index b8953f7cb37db135538efe8160f0ea16e369d496..c9b9ebdab16d8c87ae86b010d12d2165ab920d8a 100644
--- a/content/renderer/service_worker/service_worker_script_context.h
+++ b/content/renderer/service_worker/service_worker_script_context.h
@@ -36,7 +36,7 @@ class Message;
 
 namespace content {
 
-struct CrossOriginServiceWorkerClient;
+struct NavigatorConnectClient;
 class EmbeddedWorkerContextClient;
 struct PlatformNotificationData;
 
@@ -114,12 +114,12 @@ class ServiceWorkerScriptContext {
                          const std::string& region_id,
                          const blink::WebCircularGeofencingRegion& region);
   void OnCrossOriginConnectEvent(int request_id,
-                                 const CrossOriginServiceWorkerClient& client);
+                                 const NavigatorConnectClient& client);
   void OnPostMessage(const base::string16& message,
                      const std::vector<int>& sent_message_port_ids,
                      const std::vector<int>& new_routing_ids);
   void OnCrossOriginMessageToWorker(
-      const CrossOriginServiceWorkerClient& client,
+      const NavigatorConnectClient& client,
       const base::string16& message,
       const std::vector<int>& sent_message_port_ids,
       const std::vector<int>& new_routing_ids);