[WONT COMMIT] ServiceWorker: Move unregister function from WebSWProvider to WebSWRegistration (2/3)

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 99 matching lines @@
   // registration.
   WebServiceWorkerRegistrationImpl* FindServiceWorkerRegistration(
       const ServiceWorkerRegistrationObjectInfo& info,
       bool adopt_handle);
 
   // Creates a WebServiceWorkerRegistrationImpl for the specified registration
   // and transfers its ownership to the caller. If |adopt_handle| is true, a
   // ServiceWorkerRegistrationHandleReference will be adopted for the
   // registration.
   WebServiceWorkerRegistrationImpl* CreateServiceWorkerRegistration(
+      int provider_id,
       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.
@@ skipping 27 matching lines @@
       const ServiceWorkerRegistrationObjectInfo& info,
       const ServiceWorkerVersionAttributes& attrs);
   void OnAssociateRegistration(int thread_id,
                                int provider_id,
                                const ServiceWorkerRegistrationObjectInfo& info,
                                const ServiceWorkerVersionAttributes& attrs);
   void OnDisassociateRegistration(int thread_id,
                                   int provider_id);
   void OnRegistered(int thread_id,
                     int request_id,
+                    int provider_id,
                     const ServiceWorkerRegistrationObjectInfo& info,
                     const ServiceWorkerVersionAttributes& attrs);
   void OnUnregistered(int thread_id,
                       int request_id,
                       bool is_success);
   void OnDidGetRegistration(int thread_id,
                             int request_id,
+                            int provider_id,
                             const ServiceWorkerRegistrationObjectInfo& info,
                             const ServiceWorkerVersionAttributes& attrs);
   void OnRegistrationError(int thread_id,
                            int request_id,
                            blink::WebServiceWorkerError::ErrorType error_type,
                            const base::string16& message);
   void OnUnregistrationError(int thread_id,
                              int request_id,
                              blink::WebServiceWorkerError::ErrorType error_type,
                              const base::string16& message);
@@ skipping 35 matching lines @@
   void RemoveServiceWorker(int handle_id);
 
   // Keeps map from registration_handle_id to ServiceWorkerRegistration object.
   void AddServiceWorkerRegistration(
       int registration_handle_id,
       WebServiceWorkerRegistrationImpl* registration);
   void RemoveServiceWorkerRegistration(
       int registration_handle_id);
 
   WebServiceWorkerRegistrationImpl* FindOrCreateRegistration(
+      int provider_id,
       const ServiceWorkerRegistrationObjectInfo& info,
       const ServiceWorkerVersionAttributes& attrs);
 
   RegistrationCallbackMap pending_registration_callbacks_;
   UnregistrationCallbackMap pending_unregistration_callbacks_;
   GetRegistrationCallbackMap pending_get_registration_callbacks_;
 
   ProviderClientMap provider_clients_;
   ProviderContextMap provider_contexts_;
 
   WorkerObjectMap service_workers_;
   RegistrationObjectMap registrations_;
 
   // 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_