Fills the info about the live versions which aren't in the live registrations.

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 561 matching lines @@
     ServiceWorkerRegistration* registration =
         context_->GetLiveRegistration(it->registration_id);
     if (registration) {
       infos.push_back(registration->GetInfo());
       continue;
     }
     ServiceWorkerRegistrationInfo info;
     info.pattern = it->scope;
     info.script_url = it->script;
     info.registration_id = it->registration_id;
-    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;
+    if (ServiceWorkerVersion* version =
+            context_->GetLiveVersion(it->version_id)) {
+      if (it->is_active) {
+        info.active_version = version->GetInfo();
+      } else {
+        info.pending_version = version->GetInfo();
+      }

[nhiroki, 2014/06/03 04:56:52]

nit: can you omit {} like line 590-594?

[horo, 2014/06/03 05:10:47]

Done.

+    } 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;

[nhiroki, 2014/06/03 04:56:52]

Hmm... this is not related to this CL, but these setup seems wrong. If
|it->is_active| is false, we might need to setup |pending_version| instead of
|active_version|. Do you think you could take a look at this, too?

(fyi: ServiceWorkerStorage::GetOrCreateRegistration() makes a registration from
a stored value. It might be helpful to understand.)

[nhiroki, 2014/06/03 05:00:15]

I think it's ok to make it in a separate CL because it has already been broken.

[horo, 2014/06/03 05:10:47]

Um...
I'm not so familiar with creating registration.
Could you please file a bug?

+    }
     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 353 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