[M53] service worker: Refactor OnNoControllees

content/browser/service_worker/service_worker_registration.cc

Index: content/browser/service_worker/service_worker_registration.cc
diff --git a/content/browser/service_worker/service_worker_registration.cc b/content/browser/service_worker/service_worker_registration.cc
index bad9920756875f7466faaebe8ad5b0867f13f9a9..cfd1e5e6e0d9554e6d069da150e3b52d4c66c3bd 100644
--- a/content/browser/service_worker/service_worker_registration.cc
+++ b/content/browser/service_worker/service_worker_registration.cc
@@ -255,8 +255,6 @@ void ServiceWorkerRegistration::OnNoControllees(ServiceWorkerVersion* version) {
     Clear();
   else if (should_activate_when_ready_)
     ActivateWaitingVersion(true);
-  is_uninstalling_ = false;
-  should_activate_when_ready_ = false;
 }
 
 void ServiceWorkerRegistration::ActivateWaitingVersion(bool delay) {
@@ -432,6 +430,7 @@ void ServiceWorkerRegistration::OnDeleteFinished(
 void ServiceWorkerRegistration::Clear() {
   is_uninstalling_ = false;
   is_uninstalled_ = true;
+  should_activate_when_ready_ = false;
   if (context_)
     context_->storage()->NotifyDoneUninstallingRegistration(this);