ServiceWorker: Make SWProviderHost listen to SWRegistration

content/browser/service_worker/service_worker_controllee_request_handler.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_controllee_request_handler.h"
 
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_metrics.h"
 #include "content/browser/service_worker/service_worker_provider_host.h"
 #include "content/browser/service_worker/service_worker_registration.h"
@@ skipping 96 matching lines @@
   job_->GetExtraResponseInfo(was_fetched_via_service_worker,
                              original_url_via_service_worker);
 }
 
 void ServiceWorkerControlleeRequestHandler::PrepareForMainResource(
     const GURL& url) {
   DCHECK(job_.get());
   DCHECK(context_);
   // The corresponding provider_host may already have associated a registration
   // in redirect case, unassociate it now.
+  provider_host_->UnassociateRegistration();
   provider_host_->SetControllerVersion(NULL);
-  provider_host_->SetActiveVersion(NULL);
-  provider_host_->SetWaitingVersion(NULL);
-  provider_host_->SetInstallingVersion(NULL);
 
   GURL stripped_url = net::SimplifyUrlForRequest(url);
   provider_host_->SetDocumentUrl(stripped_url);
   context_->storage()->FindRegistrationForDocument(
       stripped_url,
       base::Bind(&self::DidLookupRegistrationForMainResource,
                  weak_factory_.GetWeakPtr()));
 }
 
 void
@@ skipping 14 matching lines @@
   // doesn't happen if the browser exits prior to activation
   // having occurred. This check handles that case.
   if (registration->waiting_version())
     registration->ActivateWaitingVersionWhenReady();
 
   scoped_refptr<ServiceWorkerVersion> active_version =
       registration->active_version();
 
   // Wait until it's activated before firing fetch events.
   if (active_version &&
-      active_version->status() ==  ServiceWorkerVersion::ACTIVATING) {
+      active_version->status() == ServiceWorkerVersion::ACTIVATING) {
     registration->active_version()->RegisterStatusChangeCallback(
         base::Bind(&self::OnVersionStatusChanged,
                    weak_factory_.GetWeakPtr(),
                    registration,
                    active_version));
     return;
   }
 
   if (!active_version ||
       active_version->status() != ServiceWorkerVersion::ACTIVATED) {
     job_->FallbackToNetwork();
     return;
   }
 
+  provider_host_->AssociateRegistration(registration);
   provider_host_->SetControllerVersion(registration->active_version());
-  provider_host_->SetActiveVersion(registration->active_version());
-  provider_host_->SetWaitingVersion(registration->waiting_version());
-  provider_host_->SetInstallingVersion(registration->installing_version());
 
   job_->ForwardToServiceWorker();
 }
 
 void ServiceWorkerControlleeRequestHandler::OnVersionStatusChanged(
     ServiceWorkerRegistration* registration,
     ServiceWorkerVersion* version) {
   if (version != registration->active_version() ||
       version->status() != ServiceWorkerVersion::ACTIVATED) {
     job_->FallbackToNetwork();
     return;
   }
+
+  provider_host_->AssociateRegistration(registration);
   provider_host_->SetControllerVersion(registration->active_version());
-  provider_host_->SetActiveVersion(registration->active_version());
-  provider_host_->SetWaitingVersion(registration->waiting_version());
-  provider_host_->SetInstallingVersion(registration->installing_version());
 
   job_->ForwardToServiceWorker();
 }
 
 void ServiceWorkerControlleeRequestHandler::PrepareForSubResource() {
   DCHECK(job_.get());
   DCHECK(context_);
   DCHECK(provider_host_->active_version());
   job_->ForwardToServiceWorker();
 }
 
 }  // namespace content