Refactor navigator.connect code to make it more flexible.

content/renderer/service_worker/service_worker_script_context.h

 // 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.
 
 #ifndef CONTENT_RENDERER_SERVICE_WORKER_SERVICE_WORKER_SCRIPT_CONTEXT_H_
 #define CONTENT_RENDERER_SERVICE_WORKER_SERVICE_WORKER_SCRIPT_CONTEXT_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 20 matching lines @@
 }
 
 namespace IPC {
 class Message;
 }
 
 namespace content {
 
 class EmbeddedWorkerContextClient;
 class WebServiceWorkerRegistrationImpl;
-struct CrossOriginServiceWorkerClient;
+struct NavigatorConnectClient;
 struct PlatformNotificationData;
 
 // TODO(kinuko): This should implement WebServiceWorkerContextClient
 // rather than having EmbeddedWorkerContextClient implement it.
 // See the header comment in embedded_worker_context_client.h for the
 // potential EW/SW layering concerns.
 class ServiceWorkerScriptContext {
  public:
   ServiceWorkerScriptContext(
       EmbeddedWorkerContextClient* embedded_context,
@@ skipping 58 matching lines @@
   void OnNotificationClickEvent(
       int request_id,
       const std::string& notification_id,
       const PlatformNotificationData& notification_data);
   void OnPushEvent(int request_id, const std::string& data);
   void OnGeofencingEvent(int request_id,
                          blink::WebGeofencingEventType event_type,
                          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);
   void OnDidGetClientDocuments(
       int request_id, const std::vector<ServiceWorkerClientInfo>& clients);
   void OnFocusClientResponse(int request_id, bool result);
   void OnDidSkipWaiting(int request_id);
 
   scoped_ptr<ServiceWorkerCacheStorageDispatcher> cache_storage_dispatcher_;
 
@@ skipping 23 matching lines @@
   std::map<int, base::TimeTicks> install_start_timings_;
   std::map<int, base::TimeTicks> notification_click_start_timings_;
   std::map<int, base::TimeTicks> push_start_timings_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerScriptContext);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_SERVICE_WORKER_SERVICE_WORKER_SCRIPT_CONTEXT_H_