Service Worker: set active worker to REDUNDANT when unregistered

content/browser/service_worker/service_worker_version.cc

Index: content/browser/service_worker/service_worker_version.cc
diff --git a/content/browser/service_worker/service_worker_version.cc b/content/browser/service_worker/service_worker_version.cc
index 4235bf006610264c624f39349fc8683cbb077e90..64453fdb1ca136c38ed706cdf6305fac60381a26 100644
--- a/content/browser/service_worker/service_worker_version.cc
+++ b/content/browser/service_worker/service_worker_version.cc
@@ -99,6 +99,7 @@ ServiceWorkerVersion::ServiceWorkerVersion(
       status_(NEW),
       context_(context),
       script_cache_map_(this, context),
+      is_doomed_(false),
       weak_factory_(this) {
   DCHECK(context_);
   DCHECK(registration);
@@ -386,10 +387,11 @@ void ServiceWorkerVersion::RemoveControllee(
   controllee_by_id_.Remove(found->second);
   controllee_map_.erase(found);
   RemoveProcessFromWorker(provider_host->process_id());
-  if (!HasControllee()) {
-    ScheduleStopWorker();
-    FOR_EACH_OBSERVER(Listener, listeners_, OnNoControllees(this));
-  }
+  if (HasControllee())
+    return;
+  ScheduleStopWorker();
+  if (is_doomed_)
+    DoomInternal();
 }
 
 void ServiceWorkerVersion::AddPotentialControllee(
@@ -410,6 +412,14 @@ void ServiceWorkerVersion::RemoveListener(Listener* listener) {
   listeners_.RemoveObserver(listener);
 }
 
+void ServiceWorkerVersion::Doom() {
+  if (is_doomed_)
+    return;
+  is_doomed_ = true;
+  if (!HasControllee())
+    DoomInternal();
+}
+
 void ServiceWorkerVersion::OnStarted() {
   DCHECK_EQ(RUNNING, running_status());
   // Fire all start callbacks.
@@ -656,4 +666,13 @@ void ServiceWorkerVersion::ScheduleStopWorker() {
                  base::Bind(&ServiceWorkerUtils::NoOpStatusCallback)));
 }
 
+void ServiceWorkerVersion::DoomInternal() {
+  SetStatus(REDUNDANT);
+  if (!context_)
+    return;
+  std::vector<ServiceWorkerDatabase::ResourceRecord> resources;
+  script_cache_map_.GetResources(&resources);
+  context_->storage()->PurgeResources(resources);
+}
+
 }  // namespace content