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

content/browser/service_worker/service_worker_version.h

Index: content/browser/service_worker/service_worker_version.h
diff --git a/content/browser/service_worker/service_worker_version.h b/content/browser/service_worker/service_worker_version.h
index fd8db5a8b30ef50d576f083ec3c6cef7d81d067d..5e76e732259c13ae293a327536c03d06fb8a4d86 100644
--- a/content/browser/service_worker/service_worker_version.h
+++ b/content/browser/service_worker/service_worker_version.h
@@ -240,6 +240,8 @@ class CONTENT_EXPORT ServiceWorkerVersion
   void Doom();
   bool is_doomed() const { return is_doomed_; }
 
+  bool skip_waiting() const { return skip_waiting_; }
+
  private:
   friend class base::RefCounted<ServiceWorkerVersion>;
   FRIEND_TEST_ALL_PREFIXES(ServiceWorkerControlleeRequestHandlerTest,
@@ -292,7 +294,9 @@ class CONTENT_EXPORT ServiceWorkerVersion
   void OnPostMessageToDocument(int client_id,
                                const base::string16& message,
                                const std::vector<int>& sent_message_port_ids);
+  void OnSkipWaiting(int request_id);
 
+  void DidSkipWaiting(int request_id);
   void ScheduleStopWorker();
   void DoomInternal();
 
@@ -323,6 +327,8 @@ class CONTENT_EXPORT ServiceWorkerVersion
   base::OneShotTimer<ServiceWorkerVersion> stop_worker_timer_;
   base::OneShotTimer<ServiceWorkerVersion> update_timer_;
   bool is_doomed_;
+  std::vector<int> pending_skip_waiting_requests_;
+  bool skip_waiting_;
 
   base::WeakPtrFactory<ServiceWorkerVersion> weak_factory_;