ServiceWorker: Make '.ready' return a promise to be resolved with ServiceWorkerRegistration (2/3)

content/browser/service_worker/service_worker_unregister_job.cc

 // Copyright 2014 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.
 
 #include "content/browser/service_worker/service_worker_unregister_job.h"
 
 #include "base/memory/weak_ptr.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_job_coordinator.h"
 #include "content/browser/service_worker/service_worker_registration.h"
@@ skipping 56 matching lines @@
     return;
   }
 
   // TODO: "7. If registration.updatePromise is not null..."
 
   // "8. Resolve promise."
   ResolvePromise(SERVICE_WORKER_OK);
 
   registration->ClearWhenReady();
 
+  UnassociateProviderHostsFromRegistration(registration);
   Complete(SERVICE_WORKER_OK);
 }
 
 void ServiceWorkerUnregisterJob::Complete(ServiceWorkerStatusCode status) {
   CompleteInternal(status);
   context_->job_coordinator()->FinishJob(pattern_, this);
 }
 
 void ServiceWorkerUnregisterJob::CompleteInternal(
     ServiceWorkerStatusCode status) {
   if (!is_promise_resolved_)
     ResolvePromise(status);
 }
 
 void ServiceWorkerUnregisterJob::ResolvePromise(
     ServiceWorkerStatusCode status) {
   DCHECK(!is_promise_resolved_);
   is_promise_resolved_ = true;
   for (std::vector<UnregistrationCallback>::iterator it = callbacks_.begin();
        it != callbacks_.end();
        ++it) {
     it->Run(status);
   }
 }
 
+void ServiceWorkerUnregisterJob::UnassociateProviderHostsFromRegistration(
+    ServiceWorkerRegistration* registration) {
+  DCHECK(registration);
+  for (scoped_ptr<ServiceWorkerContextCore::ProviderHostIterator> it =
+           context_->GetProviderHostIterator();
+       !it->IsAtEnd(); it->Advance()) {
+    ServiceWorkerProviderHost* host = it->GetProviderHost();
+    if (ServiceWorkerUtils::ScopeMatches(registration->pattern(),
+                                         host->document_url())) {
+      if (host->associated_registration()->id() == registration->id())
+        host->UnassociateRegistration();

[michaeln, 2014/09/04 00:27:23]

This does not look right?

The unreg doesn't really stick until there are no controllees where there are no
controllees. That's what "ClearWhenReady()" means.

[nhiroki, 2014/09/08 15:55:51]

Ah, yes. This is not correct. Removed.

+    }
+  }
+}
+
 }  // namespace content