Service Worker: in Unregister, wait until after the active worker no longer controls a document

content/browser/service_worker/service_worker_storage.h

Index: content/browser/service_worker/service_worker_storage.h
diff --git a/content/browser/service_worker/service_worker_storage.h b/content/browser/service_worker/service_worker_storage.h
index 30db1e960c1ff13e7c2ec1333c6dcb5803b03072..ed10ef36eb44f6e59f02bfa9751902a188a1d465 100644
--- a/content/browser/service_worker/service_worker_storage.h
+++ b/content/browser/service_worker/service_worker_storage.h
@@ -87,6 +87,9 @@ class CONTENT_EXPORT ServiceWorkerStorage
                              const GURL& origin,
                              const FindRegistrationCallback& callback);
 
+  scoped_refptr<ServiceWorkerRegistration> GetUninstallingRegistration(
+      const GURL& scope);
+
   // Returns info about all stored and initially installing registrations.
   void GetAllRegistrations(const GetAllRegistrationInfosCallback& callback);
 
@@ -143,6 +146,11 @@ class CONTENT_EXPORT ServiceWorkerStorage
       ServiceWorkerRegistration* registration,
       ServiceWorkerVersion* version,
       ServiceWorkerStatusCode status);
+  // Intended for use only by ServiceWorkerRegistration.
+  void NotifyUninstallingRegistration(ServiceWorkerRegistration* registration);
+  void NotifyAbortedUninstallingRegistration(
+      ServiceWorkerRegistration* registration);
+  void NotifyUninstalledRegistration(ServiceWorkerRegistration* registration);
 
   void Disable();
   bool IsDisabled() const;
@@ -248,6 +256,9 @@ class CONTENT_EXPORT ServiceWorkerStorage
                             int64 deleted_version_id,
                             const std::vector<int64>& newly_purgeable_resources,
                             ServiceWorkerDatabase::Status status);
+  void DidRestoreRegistration(int64 registration_id,
+                              ServiceWorkerStatusCode status);
+
   void DidUpdateToActiveState(
       const StatusCallback& callback,
       ServiceWorkerDatabase::Status status);
@@ -335,8 +346,9 @@ class CONTENT_EXPORT ServiceWorkerStorage
       const StatusCallback& callback,
       bool result);
 
-  // For finding registrations being installed.
+  // For finding registrations being installed or uninstalled.
   RegistrationRefsById installing_registrations_;
+  RegistrationRefsById uninstalling_registrations_;
 
   // Origins having registations.
   std::set<GURL> registered_origins_;