ServiceWorker: Introduce ServiceWorkerRegistrationObjectInfo for cleanup

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 16 matching lines @@
 }
 
 namespace content {
 
 class ServiceWorkerMessageFilter;
 class ServiceWorkerProviderContext;
 class ThreadSafeSender;
 class WebServiceWorkerImpl;
 class WebServiceWorkerRegistrationImpl;
 struct ServiceWorkerObjectInfo;
+struct ServiceWorkerRegistrationObjectInfo;
 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;
 
@@ skipping 44 matching lines @@
   WebServiceWorkerImpl* GetServiceWorker(
       const ServiceWorkerObjectInfo& info,
       bool adopt_handle);
 
   // If an existing WebServiceWorkerRegistrationImpl exists for the
   // registration, it is returned; otherwise a WebServiceWorkerRegistrationImpl
   // is created and its ownership is transferred to the caller. If
   // |adopt_handle| is true, a ServiceWorkerRegistrationHandleReference will be
   // adopted for the specified registration.
   WebServiceWorkerRegistrationImpl* GetServiceWorkerRegistration(
-      int registration_handle_id,
-      const ServiceWorkerObjectInfo& info,
+      const ServiceWorkerRegistrationObjectInfo& info,
       bool adopt_handle);
 
   // |thread_safe_sender| needs to be passed in because if the call leads to
   // construction it will be needed.
   static ServiceWorkerDispatcher* GetOrCreateThreadSpecificInstance(
       ThreadSafeSender* thread_safe_sender);
 
   // Unlike GetOrCreateThreadSpecificInstance() this doesn't create a new
   // instance if thread-local instance doesn't exist.
   static ServiceWorkerDispatcher* GetThreadSpecificInstance();
 
  private:
   typedef IDMap<WebServiceWorkerRegistrationCallbacks,
       IDMapOwnPointer> CallbackMap;
   typedef std::map<int, blink::WebServiceWorkerProviderClient*> ScriptClientMap;
   typedef std::map<int, ServiceWorkerProviderContext*> ProviderContextMap;
   typedef std::map<int, WebServiceWorkerImpl*> WorkerObjectMap;
   typedef std::map<int, ServiceWorkerProviderContext*> WorkerToProviderMap;
   typedef std::map<int, WebServiceWorkerRegistrationImpl*>
       RegistrationObjectMap;
 
   friend class WebServiceWorkerImpl;
   friend class WebServiceWorkerRegistrationImpl;
 
   // WorkerTaskRunner::Observer implementation.
   virtual void OnWorkerRunLoopStopped() OVERRIDE;
 
   void OnRegistered(int thread_id,
                     int request_id,
-                    int registration_handle_id,
-                    const ServiceWorkerObjectInfo& info);
+                    const ServiceWorkerRegistrationObjectInfo& 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 OnSetVersionAttributes(int thread_id,
@@ skipping 45 matching lines @@
   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_