Service Worker: Add ServiceWorkerContainer.getRegistrations() method.

content/browser/service_worker/service_worker_storage_unittest.cc

Index: content/browser/service_worker/service_worker_storage_unittest.cc
diff --git a/content/browser/service_worker/service_worker_storage_unittest.cc b/content/browser/service_worker/service_worker_storage_unittest.cc
index 8f9b7ceeb70963faf3d9dd414141dd3710d84308..15fc8d9961d98471aff7b2d0db0d2352eb680450 100644
--- a/content/browser/service_worker/service_worker_storage_unittest.cc
+++ b/content/browser/service_worker/service_worker_storage_unittest.cc
@@ -66,7 +66,14 @@ ServiceWorkerStorage::FindRegistrationCallback MakeFindCallback(
   return base::Bind(&FindCallback, was_called, result, found);
 }
 
-void GetAllCallback(
+void GetAllCallback(bool* was_called,
+                    std::vector<ServiceWorkerRegistration*>* all_out,
+                    const std::vector<ServiceWorkerRegistration*>& all) {
+  *was_called = true;
+  *all_out = all;
+}
+
+void GetAllInfosCallback(
     bool* was_called,
     std::vector<ServiceWorkerRegistrationInfo>* all_out,
     const std::vector<ServiceWorkerRegistrationInfo>& all) {
@@ -74,12 +81,20 @@ void GetAllCallback(
   *all_out = all;
 }
 
-ServiceWorkerStorage::GetRegistrationsInfosCallback
-MakeGetRegistrationsCallback(bool* was_called,
-                             std::vector<ServiceWorkerRegistrationInfo>* all) {
+ServiceWorkerStorage::GetRegistrationsCallback MakeGetRegistrationsCallback(
+    bool* was_called,
+    std::vector<ServiceWorkerRegistration*>* all,
+    std::vector<std::vector<ResourceRecord>>* resource_lists) {
   return base::Bind(&GetAllCallback, was_called, all);
 }
 
+ServiceWorkerStorage::GetRegistrationsInfosCallback
+MakeGetRegistrationsInfosCallback(
+    bool* was_called,
+    std::vector<ServiceWorkerRegistrationInfo>* all) {
+  return base::Bind(&GetAllInfosCallback, was_called, all);
+}
+
 void GetUserDataCallback(
     bool* was_called,
     std::string* data_out,
@@ -329,11 +344,11 @@ class ServiceWorkerStorageTest : public testing::Test {
     return result;
   }
 
-  void GetAllRegistrations(
+  void GetAllRegistrationsInfos(
       std::vector<ServiceWorkerRegistrationInfo>* registrations) {
     bool was_called = false;
-    storage()->GetAllRegistrations(
-        MakeGetRegistrationsCallback(&was_called, registrations));
+    storage()->GetAllRegistrationsInfos(
+        MakeGetRegistrationsInfosCallback(&was_called, registrations));
     EXPECT_FALSE(was_called);  // always async
     base::RunLoop().RunUntilIdle();
     EXPECT_TRUE(was_called);
@@ -341,11 +356,12 @@ class ServiceWorkerStorageTest : public testing::Test {
 
   void GetRegistrationsForOrigin(
       const GURL& origin,
-      std::vector<ServiceWorkerRegistrationInfo>* registrations) {
+      std::vector<ServiceWorkerRegistration*>* registrations,
+      std::vector<std::vector<ResourceRecord>>* resource_lists) {
     bool was_called = false;
     storage()->GetRegistrationsForOrigin(
-        origin,
-        MakeGetRegistrationsCallback(&was_called, registrations));
+        origin, MakeGetRegistrationsCallback(&was_called, registrations,
+                                             resource_lists));
     EXPECT_FALSE(was_called);  // always async
     base::RunLoop().RunUntilIdle();
     EXPECT_TRUE(was_called);
@@ -579,21 +595,22 @@ TEST_F(ServiceWorkerStorageTest, StoreFindUpdateDeleteRegistration) {
   EXPECT_EQ(kResource1Size + kResource2Size,
             found_registration->resources_total_size_bytes());
   std::vector<ServiceWorkerRegistrationInfo> all_registrations;
-  GetAllRegistrations(&all_registrations);
+  GetAllRegistrationsInfos(&all_registrations);
   EXPECT_EQ(1u, all_registrations.size());
   ServiceWorkerRegistrationInfo info = all_registrations[0];
   EXPECT_EQ(kResource1Size + kResource2Size, info.stored_version_size_bytes);
   all_registrations.clear();
 
   // Finding by origin should provide the same result iif origin is kScope.
-  std::vector<ServiceWorkerRegistrationInfo> registrations_origin;
-  GetRegistrationsForOrigin(kScope.GetOrigin(), &registrations_origin);
+  std::vector<ServiceWorkerRegistration*> registrations_origin;
+  std::vector<std::vector<ResourceRecord>> resource_lists;
+  GetRegistrationsForOrigin(kScope.GetOrigin(), &registrations_origin,
+                            &resource_lists);
   EXPECT_EQ(1u, registrations_origin.size());
   registrations_origin.clear();
 
-  GetRegistrationsForOrigin(
-      GURL("http://example.com/").GetOrigin(),
-      &registrations_origin);
+  GetRegistrationsForOrigin(GURL("http://example.com/").GetOrigin(),
+                            &registrations_origin, &resource_lists);
   EXPECT_TRUE(registrations_origin.empty());
 
   found_registration = NULL;
@@ -685,7 +702,7 @@ TEST_F(ServiceWorkerStorageTest, InstallingRegistrationsAreFindable) {
   live_version->SetStatus(ServiceWorkerVersion::INSTALLING);
   live_registration->SetWaitingVersion(live_version);
 
-  // Should not be findable, including by GetAllRegistrations.
+  // Should not be findable, including by GetAllRegistrationsInfos.
   EXPECT_EQ(SERVICE_WORKER_ERROR_NOT_FOUND,
             FindRegistrationForId(
                 kRegistrationId, kScope.GetOrigin(), &found_registration));
@@ -704,16 +721,17 @@ TEST_F(ServiceWorkerStorageTest, InstallingRegistrationsAreFindable) {
   EXPECT_FALSE(found_registration.get());
 
   std::vector<ServiceWorkerRegistrationInfo> all_registrations;
-  GetAllRegistrations(&all_registrations);
+  GetAllRegistrationsInfos(&all_registrations);
   EXPECT_TRUE(all_registrations.empty());
 
-  std::vector<ServiceWorkerRegistrationInfo> registrations_origin;
-  GetRegistrationsForOrigin(kScope.GetOrigin(), &registrations_origin);
+  std::vector<ServiceWorkerRegistration*> registrations_origin;
+  std::vector<std::vector<ResourceRecord>> resource_lists;
+  GetRegistrationsForOrigin(kScope.GetOrigin(), &registrations_origin,
+                            &resource_lists);
   EXPECT_TRUE(registrations_origin.empty());
 
-  GetRegistrationsForOrigin(
-      GURL("http://example.com/").GetOrigin(),
-      &registrations_origin);
+  GetRegistrationsForOrigin(GURL("http://example.com/").GetOrigin(),
+                            &registrations_origin, &resource_lists);
   EXPECT_TRUE(registrations_origin.empty());
 
   // Notify storage of it being installed.
@@ -741,18 +759,18 @@ TEST_F(ServiceWorkerStorageTest, InstallingRegistrationsAreFindable) {
   EXPECT_EQ(live_registration, found_registration);
   found_registration = NULL;
 
-  GetAllRegistrations(&all_registrations);
+  GetAllRegistrationsInfos(&all_registrations);
   EXPECT_EQ(1u, all_registrations.size());
   all_registrations.clear();
 
   // Finding by origin should provide the same result iif origin is kScope.
-  GetRegistrationsForOrigin(kScope.GetOrigin(), &registrations_origin);
+  GetRegistrationsForOrigin(kScope.GetOrigin(), &registrations_origin,
+                            &resource_lists);
   EXPECT_EQ(1u, registrations_origin.size());
   registrations_origin.clear();
 
-  GetRegistrationsForOrigin(
-      GURL("http://example.com/").GetOrigin(),
-      &registrations_origin);
+  GetRegistrationsForOrigin(GURL("http://example.com/").GetOrigin(),
+                            &registrations_origin, &resource_lists);
   EXPECT_TRUE(registrations_origin.empty());
 
   // Notify storage of installation no longer happening.
@@ -777,15 +795,15 @@ TEST_F(ServiceWorkerStorageTest, InstallingRegistrationsAreFindable) {
             FindRegistrationForPattern(kScope, &found_registration));
   EXPECT_FALSE(found_registration.get());
 
-  GetAllRegistrations(&all_registrations);
+  GetAllRegistrationsInfos(&all_registrations);
   EXPECT_TRUE(all_registrations.empty());
 
-  GetRegistrationsForOrigin(kScope.GetOrigin(), &registrations_origin);
+  GetRegistrationsForOrigin(kScope.GetOrigin(), &registrations_origin,
+                            &resource_lists);
   EXPECT_TRUE(registrations_origin.empty());
 
-  GetRegistrationsForOrigin(
-      GURL("http://example.com/").GetOrigin(),
-      &registrations_origin);
+  GetRegistrationsForOrigin(GURL("http://example.com/").GetOrigin(),
+                            &registrations_origin, &resource_lists);
   EXPECT_TRUE(registrations_origin.empty());
 }