ServiceWorker: Update the install sequence as per the latest spec

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 "base/message_loop/message_loop.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
@@ skipping 320 matching lines @@
 
 void ServiceWorkerRegisterJob::OnStartWorkerFinished(
     ServiceWorkerStatusCode status) {
   // "If serviceWorker fails to start up..." then reject the promise with an
   // error and abort.
   if (status != SERVICE_WORKER_OK) {
     Complete(status);
     return;
   }
 
-  // "Resolve promise with serviceWorker."
-  DCHECK(!registration()->installing_version());
-  ResolvePromise(status, registration(), new_version());
   InstallAndContinue();
 }
 
-// This function corresponds to the spec's _Install algorithm.
+// This function corresponds to the spec's [[Install]] algorithm.
 void ServiceWorkerRegisterJob::InstallAndContinue() {
   SetPhase(INSTALL);
 
-  // "3. Set registration.installingWorker to worker."
+  // "2. Set registration.installingWorker to worker."
   registration()->SetInstallingVersion(new_version());
 
+  // "3. Resolve promise with registration."
+  ResolvePromise(SERVICE_WORKER_OK, registration(), new_version());
+
   // "4. Run the [[UpdateState]] algorithm passing registration.installingWorker
   // and "installing" as the arguments."
   new_version()->SetStatus(ServiceWorkerVersion::INSTALLING);

[nhiroki, 2014/08/29 09:22:49]

fyi: I'm wondering if we should set the worker to 'installing' before calling
ResolvePromise so that we can hide the 'parsed' state in JS. Filled a github
issue:
https://github.com/slightlyoff/ServiceWorker/issues/432

 
-  // TODO(nhiroki,michaeln): "5. Fire a simple event named updatefound..."
+  // "5. Fire a simple event named updatefound..."
+  registration()->NotifyUpdateFound();
 
   // "6. Fire an event named install..."
   new_version()->DispatchInstallEvent(
       -1,
       base::Bind(&ServiceWorkerRegisterJob::OnInstallFinished,
                  weak_factory_.GetWeakPtr()));
 }
 
 void ServiceWorkerRegisterJob::OnInstallFinished(
     ServiceWorkerStatusCode status) {
@@ skipping 165 matching lines @@
     ServiceWorkerProviderHost* host = it->GetProviderHost();
     if (ServiceWorkerUtils::ScopeMatches(registration->pattern(),
                                          host->document_url())) {
       if (host->CanAssociateRegistration(registration))
         host->AssociateRegistration(registration);
     }
   }
 }
 
 }  // namespace content