Refactor navigator.connect code to make it more flexible.

content/renderer/service_worker/service_worker_script_context.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/service_worker/service_worker_script_context.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "content/child/notifications/notification_data_conversions.h"
@@ skipping 329 matching lines @@
   TRACE_EVENT0("ServiceWorker",
                "ServiceWorkerScriptContext::OnGeofencingEvent");
   proxy_->dispatchGeofencingEvent(
       request_id, event_type, blink::WebString::fromUTF8(region_id), region);
   Send(new ServiceWorkerHostMsg_GeofencingEventFinished(GetRoutingID(),
                                                         request_id));
 }
 
 void ServiceWorkerScriptContext::OnCrossOriginConnectEvent(
     int request_id,
-    const CrossOriginServiceWorkerClient& client) {
+    const NavigatorConnectClient& client) {
   TRACE_EVENT0("ServiceWorker",
                "ServiceWorkerScriptContext::OnCrossOriginConnectEvent");
   blink::WebCrossOriginServiceWorkerClient web_client;
   web_client.origin = client.origin;
   web_client.targetURL = client.target_url;
   web_client.clientID = client.message_port_id;
   proxy_->dispatchCrossOriginConnectEvent(request_id, web_client);
 }
 
 void ServiceWorkerScriptContext::OnPostMessage(
@@ skipping 15 matching lines @@
   // dispatchMessageEvent is expected to execute onmessage function
   // synchronously.
   base::TimeTicks before = base::TimeTicks::Now();
   proxy_->dispatchMessageEvent(message, ports);
   UMA_HISTOGRAM_TIMES(
       "ServiceWorker.MessageEventExecutionTime",
       base::TimeTicks::Now() - before);
 }
 
 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) {
   TRACE_EVENT0("ServiceWorker",
                "ServiceWorkerScriptContext::OnCrossOriginMessageToWorker");
   std::vector<WebMessagePortChannelImpl*> ports;
   if (!sent_message_port_ids.empty()) {
     base::MessageLoopProxy* loop_proxy = embedded_context_->main_thread_proxy();
     ports.resize(sent_message_port_ids.size());
     for (size_t i = 0; i < sent_message_port_ids.size(); ++i) {
@@ skipping 57 matching lines @@
       pending_skip_waiting_callbacks_.Lookup(request_id);
   if (!callbacks) {
     NOTREACHED() << "Got stray response: " << request_id;
     return;
   }
   callbacks->onSuccess();
   pending_skip_waiting_callbacks_.Remove(request_id);
 }
 
 }  // namespace content