Introduce ServiceWorkerHandle for tracking WebServiceWorkerImpl reference

content/browser/service_worker/service_worker_register_job.cc

 // 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.
 
 #include "content/browser/service_worker/service_worker_register_job.h"
 
 #include <vector>
 
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_job_coordinator.h"
@@ skipping 67 matching lines @@
   // registration and abort.
   if (registration.get() && registration->script_url() == script_url_) {
     registration_ = registration;
     // If there's no active version, go ahead to Update (this isn't in the spec
     // but seems reasonable, and without SoftUpdate implemented we can never
     // Update otherwise).
     if (!registration_->active_version()) {
       UpdateAndContinue(status);
       return;
     }
-    RunCallbacks(status, registration_->active_version());
+    RunCallbacks(status, registration_, registration_->active_version());
     Complete(SERVICE_WORKER_OK);
     return;
   }
 
   // "If serviceWorkerRegistration is null..." create a new registration.
   if (!registration.get()) {
     RegisterAndContinue(SERVICE_WORKER_OK);
     return;
   }
 
   // On script URL mismatch, "set serviceWorkerRegistration.scriptUrl to
   // script." We accomplish this by deleting the existing registration and
   // registering a new one.
   // TODO(falken): Match the spec. We now throw away the active_version_ and
   // pending_version_ of the existing registration, which isn't in the spec.
-  registration->Shutdown();
   context_->storage()->DeleteRegistration(
       pattern_,
       base::Bind(&ServiceWorkerRegisterJob::RegisterAndContinue,
                  weak_factory_.GetWeakPtr()));
 }
 
 // Registers a new ServiceWorkerRegistration.
 void ServiceWorkerRegisterJob::RegisterAndContinue(
     ServiceWorkerStatusCode status) {
   DCHECK(!registration_);
@@ skipping 52 matching lines @@
     Complete(status);
     return;
   }
 
   // "Resolve promise with serviceWorker."
   // Although the spec doesn't set pendingWorker until after resolving the
   // promise, our system's resolving works by passing ServiceWorkerRegistration
   // to the callbacks, so pendingWorker must be set first.
   DCHECK(!registration_->pending_version());
   registration_->set_pending_version(pending_version_);
-  RunCallbacks(status, pending_version_.get());
+  RunCallbacks(status, registration_, pending_version_.get());
 
   InstallAndContinue();
 }
 
 // This function corresponds to the spec's _Install algorithm.
 void ServiceWorkerRegisterJob::InstallAndContinue() {
   // "Set serviceWorkerRegistration.pendingWorker._state to installing."
   // "Fire install event on the associated ServiceWorkerGlobalScope object."
   pending_version_->DispatchInstallEvent(
       -1,
@@ skipping 27 matching lines @@
   registration_->set_active_version(pending_version_);
   pending_version_ = NULL;
   Complete(SERVICE_WORKER_OK);
 }
 
 void ServiceWorkerRegisterJob::Complete(ServiceWorkerStatusCode status) {
   // In success case the callbacks must have been dispatched already
   // (so this is no-op), otherwise we must have come here for abort case,
   // so dispatch callbacks with NULL.
   DCHECK(callbacks_.empty() || status != SERVICE_WORKER_OK);
-  RunCallbacks(status, NULL);
-
-  // If |pending_version_| exists, it was not activated, so we are the sole
-  // owner of it, so it will be destroyed when this job ends, so Shutdown here.
-  // We should be able to remove this code later, when something else holds a
-  // reference to |pending_version_|.
-  // TODO(kinuko): Fix these ownership and shutdown semantics.
-  if (pending_version_) {
-    DCHECK(!registration_->pending_version());
-    DCHECK(!registration_->active_version());
-    pending_version_->Shutdown();
-  }
+  RunCallbacks(status, NULL, NULL);
 
   context_->job_coordinator()->FinishJob(pattern_, this);
 }
 
-void ServiceWorkerRegisterJob::RunCallbacks(ServiceWorkerStatusCode status,
-                                            ServiceWorkerVersion* version) {
+void ServiceWorkerRegisterJob::RunCallbacks(
+    ServiceWorkerStatusCode status,
+    ServiceWorkerRegistration* registration,
+    ServiceWorkerVersion* version) {
   for (std::vector<RegistrationCallback>::iterator it = callbacks_.begin();
        it != callbacks_.end();
        ++it) {
-    it->Run(status, version);
+    it->Run(status, registration, version);
   }
   callbacks_.clear();
 }
 
 }  // namespace content