Add ServiceWorkerVersion::status() (which is to be persisted unlike running status)

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_job_coordinator.h"
@@ skipping 93 matching lines @@
     ServiceWorkerStatusCode status) {
   DCHECK(registration_);
   if (registration_->active_version()) {
     // We have an active version, so we can complete immediately, even
     // if the service worker isn't running.
     callback.Run(SERVICE_WORKER_OK);
     return;
   }
 
   pending_version_ = new ServiceWorkerVersion(
-      registration_, worker_registry_, registration_->next_version_id());
+      registration_, worker_registry_,
+      storage_->NewVersionId());
   for (std::vector<int>::const_iterator it = pending_process_ids_.begin();
        it != pending_process_ids_.end();
        ++it)
     pending_version_->AddProcessToWorker(*it);
 
   // The callback to watch "installation" actually fires as soon as
   // the worker is up and running, just before the install event is
   // dispatched. The job will continue to run even though the main
   // callback has executed.
   pending_version_->StartWorker(callback);
 
   // TODO(alecflett): Don't set the active version until just before
   // the activate event is dispatched.
+  pending_version_->set_status(ServiceWorkerVersion::ACTIVE);
   registration_->set_active_version(pending_version_);
 }
 
 void ServiceWorkerRegisterJob::RegisterPatternAndContinue(
     const StatusCallback& callback,
     ServiceWorkerStatusCode previous_status) {
   if (previous_status == SERVICE_WORKER_ERROR_EXISTS) {
     // Registration already exists, call to the next step.
     RunSoon(base::Bind(callback, SERVICE_WORKER_OK));
     return;
@@ skipping 45 matching lines @@
 void ServiceWorkerRegisterJob::Complete(ServiceWorkerStatusCode status) {
   for (std::vector<RegistrationCallback>::iterator it = callbacks_.begin();
        it != callbacks_.end();
        ++it) {
     it->Run(status, registration_);
   }
   coordinator_->FinishJob(pattern_, this);
 }
 
 }  // namespace content