ServiceWorker: propagate provider_id to the browser process in .register + int32/int 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 "base/id_map.h"
@@ skipping 24 matching lines @@
 class ServiceWorkerDispatcher : public WorkerTaskRunner::Observer {
  public:
   explicit ServiceWorkerDispatcher(ThreadSafeSender* thread_safe_sender);
   virtual ~ServiceWorkerDispatcher();
 
   void OnMessageReceived(const IPC::Message& msg);
   bool Send(IPC::Message* msg);
 
   // Corresponds to navigator.serviceWorker.register()
   void RegisterServiceWorker(
+      int provider_id,
       const GURL& pattern,
       const GURL& script_url,
       blink::WebServiceWorkerProvider::WebServiceWorkerCallbacks* callbacks);
   // Corresponds to navigator.serviceWorker.unregister()
   void UnregisterServiceWorker(
+      int provider_id,
       const GURL& pattern,
       blink::WebServiceWorkerProvider::WebServiceWorkerCallbacks* callbacks);
 
   // Called when navigator.serviceWorker is instantiated or detached
   // for a document whose provider can be identified by |provider_id|.
   void AddScriptClient(int provider_id,
                        blink::WebServiceWorkerProviderClient* client);
   void RemoveScriptClient(int provider_id);
 
   // |thread_safe_sender| needs to be passed in because if the call leads to
   // construction it will be needed.
   static ServiceWorkerDispatcher* ThreadSpecificInstance(
       ThreadSafeSender* thread_safe_sender);
 
  private:
   typedef std::map<int, blink::WebServiceWorkerProviderClient*> ScriptClientMap;
 
   // WorkerTaskRunner::Observer implementation.
   virtual void OnWorkerRunLoopStopped() OVERRIDE;
 
   // The asynchronous success response to RegisterServiceWorker.
-  void OnRegistered(int32 thread_id,
-                    int32 request_id,
+  void OnRegistered(int thread_id,
+                    int request_id,
                     int handle_id);
   // The asynchronous success response to UregisterServiceWorker.
-  void OnUnregistered(int32 thread_id,
-                      int32 request_id);
-  void OnRegistrationError(int32 thread_id,
-                           int32 request_id,
+  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);
 
   IDMap<blink::WebServiceWorkerProvider::WebServiceWorkerCallbacks,
         IDMapOwnPointer> pending_callbacks_;
   ScriptClientMap script_clients_;
 
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerDispatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_H_