ServiceWorker: Fill waiting version if stored data is not active

content/browser/service_worker/service_worker_storage.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_storage.h"
 
 #include <string>
 
 #include "base/bind_helpers.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 575 matching lines @@
     ServiceWorkerRegistrationInfo info;
     info.pattern = it->scope;
     info.script_url = it->script;
     info.registration_id = it->registration_id;
     if (ServiceWorkerVersion* version =
             context_->GetLiveVersion(it->version_id)) {
       if (it->is_active)
         info.active_version = version->GetInfo();
       else
         info.waiting_version = version->GetInfo();
+      infos.push_back(info);
+      continue;
+    }
+
+    if (it->is_active) {
+      info.active_version.is_null = false;
+      info.active_version.status = ServiceWorkerVersion::ACTIVE;
+      info.active_version.version_id = it->version_id;
     } else {
-      info.active_version.is_null = false;
-      if (it->is_active)
-        info.active_version.status = ServiceWorkerVersion::ACTIVE;
-      else
-        info.active_version.status = ServiceWorkerVersion::INSTALLED;
-      info.active_version.version_id = it->version_id;
+      info.waiting_version.is_null = false;
+      info.waiting_version.status = ServiceWorkerVersion::INSTALLED;
+      info.waiting_version.version_id = it->version_id;
     }
     infos.push_back(info);
   }
 
   // Add unstored registrations that are being installed.
   for (RegistrationRefsById::const_iterator it =
            installing_registrations_.begin();
        it != installing_registrations_.end(); ++it) {
     if (pushed_registrations.insert(it->first).second)
       infos.push_back(it->second->GetInfo());
@@ skipping 358 matching lines @@
     const FindInDBCallback& callback) {
   ServiceWorkerDatabase::RegistrationData data;
   ResourceList resources;
   ServiceWorkerDatabase::Status status =
       database->ReadRegistration(registration_id, origin, &data, &resources);
   original_task_runner->PostTask(
       FROM_HERE, base::Bind(callback, data, resources, status));
 }
 
 }  // namespace content