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

content/browser/service_worker/service_worker_registration.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_BROWSER_SERVICE_WORKER_SERVICE_WORKER_REGISTRATION_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_REGISTRATION_H_
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/logging.h"
@@ skipping 32 matching lines @@
 
   ServiceWorkerRegistration(const GURL& pattern,
                             const GURL& script_url,
                             int64 registration_id,
                             base::WeakPtr<ServiceWorkerContextCore> context);
 
   int64 id() const { return registration_id_; }
   const GURL& script_url() const { return script_url_; }
   const GURL& pattern() const { return pattern_; }
 
+  bool is_deleted() const { return is_deleted_; }
+  void set_is_deleted(bool deleted) { is_deleted_ = deleted; }
+
+  bool is_uninstalling() const { return is_uninstalling_; }
+
   ServiceWorkerVersion* active_version() const {
     return active_version_.get();
   }
 
   ServiceWorkerVersion* waiting_version() const {
     return waiting_version_.get();
   }
 
   ServiceWorkerVersion* installing_version() const {
     return installing_version_.get();
@@ skipping 15 matching lines @@
   // If version is the installing, waiting, active version of this
   // registation, the method will reset that field to NULL, and notify
   // listeners via OnVersionAttributesChanged.
   void UnsetVersion(ServiceWorkerVersion* version);
 
   // Triggers the [[Activate]] algorithm when the currently active version
   // has no controllees. If there are no controllees at the time the method
   // is called, activation is initiated immediately.
   void ActivateWaitingVersionWhenReady();
 
-  bool is_deleted() const { return is_deleted_; }
-  void set_is_deleted() { is_deleted_ = true; }
+  // Triggers the [[ClearRegistration]] algorithm when the currently
+  // active version has no controllees. Deletes this registration
+  // from storage immediately.
+  void ClearWhenReady();
+
+  // Restores this registration in storage and cancels the pending
+  // [[ClearRegistration]] algorithm. If the algorithm was already triggered,
+  // does nothing.
+  void AbortPendingClear();
 
  private:
   friend class base::RefCounted<ServiceWorkerRegistration>;
 
   virtual ~ServiceWorkerRegistration();
 
   void SetVersionInternal(
       ServiceWorkerVersion* version,
       scoped_refptr<ServiceWorkerVersion>* data_member,
       int change_flag);
   void UnsetVersionInternal(
       ServiceWorkerVersion* version,
       ChangedVersionAttributesMask* mask);
 
   // ServiceWorkerVersion::Listener override.
   virtual void OnNoControllees(ServiceWorkerVersion* version) OVERRIDE;
 
   // This method corresponds to the [[Activate]] algorithm.
   void ActivateWaitingVersion();
   void OnActivateEventFinished(
       ServiceWorkerVersion* activating_version,
       ServiceWorkerStatusCode status);
-  void ResetShouldActivateWhenReady();
   void OnDeleteFinished(ServiceWorkerStatusCode status);
 
+  // This method corresponds to the [[ClearRegistration]] algorithm.
+  void Clear();
+  void OnStoreFinished(scoped_refptr<ServiceWorkerVersion> version,
+                       ServiceWorkerStatusCode status);
+
   const GURL pattern_;
   const GURL script_url_;
   const int64 registration_id_;
   bool is_deleted_;
+  bool is_uninstalling_;
   bool should_activate_when_ready_;
   scoped_refptr<ServiceWorkerVersion> active_version_;
   scoped_refptr<ServiceWorkerVersion> waiting_version_;
   scoped_refptr<ServiceWorkerVersion> installing_version_;
   ObserverList<Listener> listeners_;
   base::WeakPtr<ServiceWorkerContextCore> context_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerRegistration);
 };
+
 }  // namespace content
+
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_REGISTRATION_H_