ServiceWorker: Add support for .skipWaiting and controllerchange event(2/3)

content/renderer/service_worker/service_worker_script_context.h

Index: content/renderer/service_worker/service_worker_script_context.h
diff --git a/content/renderer/service_worker/service_worker_script_context.h b/content/renderer/service_worker/service_worker_script_context.h
index 98f2f5c1415fd0a2e1824607f433b20aaafc5c8d..c632979d5f400a1858392eb41bce6db2ec7ecfdc 100644
--- a/content/renderer/service_worker/service_worker_script_context.h
+++ b/content/renderer/service_worker/service_worker_script_context.h
@@ -21,6 +21,7 @@
 #include "third_party/WebKit/public/platform/WebMessagePortChannel.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerClientsInfo.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerEventResult.h"
+#include "third_party/WebKit/public/platform/WebServiceWorkerSkipWaitingCallbacks.h"
 
 namespace blink {
 struct WebCircularGeofencingRegion;
@@ -64,6 +65,7 @@ class ServiceWorkerScriptContext {
       int client_id,
       const base::string16& message,
       scoped_ptr<blink::WebMessagePortChannelArray> channels);
+  void SkipWaiting(blink::WebServiceWorkerSkipWaitingCallbacks* callbacks);
 
   // Send a message to the browser. Takes ownership of |message|.
   void Send(IPC::Message* message);
@@ -79,7 +81,8 @@ class ServiceWorkerScriptContext {
  private:
   typedef IDMap<blink::WebServiceWorkerClientsCallbacks, IDMapOwnPointer>
       ClientsCallbacksMap;
-
+  typedef IDMap<blink::WebServiceWorkerSkipWaitingCallbacks, IDMapOwnPointer>
+      SkipWaitingCallbacksMap;
 
   void OnActivateEvent(int request_id);
   void OnInstallEvent(int request_id, int active_version_id);
@@ -95,6 +98,7 @@ class ServiceWorkerScriptContext {
                      const std::vector<int>& new_routing_ids);
   void OnDidGetClientDocuments(
       int request_id, const std::vector<int>& client_ids);
+  void OnDidSkipWaiting(int request_id);
 
   scoped_ptr<ServiceWorkerCacheStorageDispatcher> cache_storage_dispatcher_;
 
@@ -112,6 +116,9 @@ class ServiceWorkerScriptContext {
   // Pending callbacks for GetClientDocuments().
   ClientsCallbacksMap pending_clients_callbacks_;
 
+  // Pending callbacks for SkipWaiting().
+  SkipWaitingCallbacksMap pending_skip_waiting_callbacks_;
+
   // Capture timestamps for UMA
   std::map<int, base::TimeTicks> activate_start_timings_;
   std::map<int, base::TimeTicks> fetch_start_timings_;