ServiceWorker: Consolidate version change messages

content/child/service_worker/service_worker_dispatcher.h

 // Copyright 2013 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_CHILD_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_H_
 #define CONTENT_CHILD_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 11 matching lines @@
 class WebURL;
 }
 
 namespace IPC {
 class Message;
 }
 
 namespace content {
 
 class ServiceWorkerMessageFilter;
-struct ServiceWorkerObjectInfo;
 class ServiceWorkerProviderContext;
 class ThreadSafeSender;
 class WebServiceWorkerImpl;
+struct ServiceWorkerObjectInfo;
+struct ServiceWorkerVersionAttributes;
 
 // This class manages communication with the browser process about
 // registration of the service worker, exposed to renderer and worker
 // scripts through methods like navigator.registerServiceWorker().
 class ServiceWorkerDispatcher : public WorkerTaskRunner::Observer {
  public:
   typedef blink::WebServiceWorkerProvider::WebServiceWorkerRegistrationCallbacks
       WebServiceWorkerRegistrationCallbacks;
 
   explicit ServiceWorkerDispatcher(ThreadSafeSender* thread_safe_sender);
@@ skipping 70 matching lines @@
                     const ServiceWorkerObjectInfo& info);
   void OnUnregistered(int thread_id,
                       int request_id);
   void OnRegistrationError(int thread_id,
                            int request_id,
                            blink::WebServiceWorkerError::ErrorType error_type,
                            const base::string16& message);
   void OnServiceWorkerStateChanged(int thread_id,
                                    int handle_id,
                                    blink::WebServiceWorkerState state);
-  void OnSetInstallingServiceWorker(int thread_id,
-                                    int provider_id,
-                                    const ServiceWorkerObjectInfo& info);
-  void OnSetWaitingServiceWorker(int thread_id,
-                                 int provider_id,
-                                 const ServiceWorkerObjectInfo& info);
-  void OnSetActiveServiceWorker(int thread_id,
-                                int provider_id,
-                                const ServiceWorkerObjectInfo& info);
+  void OnSetVersionAttributes(int thread_id,
+                              int provider_id,
+                              int changed_mask,
+                              const ServiceWorkerVersionAttributes& attributes);
   void OnSetControllerServiceWorker(int thread_id,
                                     int provider_id,
                                     const ServiceWorkerObjectInfo& info);
   void OnPostMessage(int thread_id,
                      int provider_id,
                      const base::string16& message,
                      const std::vector<int>& sent_message_port_ids,
                      const std::vector<int>& new_routing_ids);
 
+  void SetInstallingServiceWorker(
+      int provider_id,
+      const ServiceWorkerObjectInfo& info);
+  void SetWaitingServiceWorker(
+      int provider_id,
+      const ServiceWorkerObjectInfo& info);
+  void SetActiveServiceWorker(
+      int provider_id,
+      const ServiceWorkerObjectInfo& info);
+
   // Keeps map from handle_id to ServiceWorker object.
   void AddServiceWorker(int handle_id, WebServiceWorkerImpl* worker);
   void RemoveServiceWorker(int handle_id);
 
   CallbackMap pending_callbacks_;
   ScriptClientMap script_clients_;
   ProviderContextMap provider_contexts_;
   WorkerObjectMap service_workers_;
 
   // A map for ServiceWorkers that are associated to a particular document
   // (e.g. as .current).
   WorkerToProviderMap worker_to_provider_;
 
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerDispatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_H_