Refactor navigator.connect code to make it more flexible.

content/renderer/service_worker/service_worker_script_context.cc

Index: content/renderer/service_worker/service_worker_script_context.cc
diff --git a/content/renderer/service_worker/service_worker_script_context.cc b/content/renderer/service_worker/service_worker_script_context.cc
index 12235e70196218cab962851d569fd15c9c2ba991..4a360f1dcdcf0698c118e9bb60ba4608bbe636e1 100644
--- a/content/renderer/service_worker/service_worker_script_context.cc
+++ b/content/renderer/service_worker/service_worker_script_context.cc
@@ -347,7 +347,7 @@ void ServiceWorkerScriptContext::OnGeofencingEvent(
 
 void ServiceWorkerScriptContext::OnCrossOriginConnectEvent(
     int request_id,
-    const CrossOriginServiceWorkerClient& client) {
+    const NavigatorConnectClient& client) {
   TRACE_EVENT0("ServiceWorker",
                "ServiceWorkerScriptContext::OnCrossOriginConnectEvent");
   blink::WebCrossOriginServiceWorkerClient web_client;
@@ -383,7 +383,7 @@ void ServiceWorkerScriptContext::OnPostMessage(
 }
 
 void ServiceWorkerScriptContext::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) {