Refactor navigator.connect code to make it more flexible.

content/browser/service_worker/service_worker_version.h

Index: content/browser/service_worker/service_worker_version.h
diff --git a/content/browser/service_worker/service_worker_version.h b/content/browser/service_worker/service_worker_version.h
index 136cee9b8809c4afcf5f053ae67abaa65e9048ad..6954a4208010e064ca83afbc39d6aa48f6eec63f 100644
--- a/content/browser/service_worker/service_worker_version.h
+++ b/content/browser/service_worker/service_worker_version.h
@@ -35,8 +35,8 @@ struct WebCircularGeofencingRegion;
 
 namespace content {
 
-struct CrossOriginServiceWorkerClient;
 class EmbeddedWorkerRegistry;
+struct NavigatorConnectClient;
 struct PlatformNotificationData;
 class ServiceWorkerContextCore;
 class ServiceWorkerProviderHost;
@@ -243,7 +243,7 @@ class CONTENT_EXPORT ServiceWorkerVersion
   // This must be called when the status() is ACTIVATED.
   void DispatchCrossOriginConnectEvent(
       const CrossOriginConnectCallback& callback,
-      const CrossOriginServiceWorkerClient& client);
+      const NavigatorConnectClient& client);
 
   // Sends a cross origin message event to the associated embedded worker and
   // asynchronously calls |callback| when the message was sent (or failed to
@@ -254,7 +254,7 @@ class CONTENT_EXPORT ServiceWorkerVersion
   //
   // This must be called when the status() is ACTIVATED.
   void DispatchCrossOriginMessageEvent(
-      const CrossOriginServiceWorkerClient& client,
+      const NavigatorConnectClient& client,
       const base::string16& message,
       const std::vector<int>& sent_message_port_ids,
       const StatusCallback& callback);