Don't prematurely delete script resources when registration is deleted

content/browser/service_worker/service_worker_database_unittest.cc

Index: content/browser/service_worker/service_worker_database_unittest.cc
diff --git a/content/browser/service_worker/service_worker_database_unittest.cc b/content/browser/service_worker/service_worker_database_unittest.cc
index baa2542cbc1b2d5ae272842f7e72352b86e12138..f243333d7f4cab88af2fbcc3d875f622076287f1 100644
--- a/content/browser/service_worker/service_worker_database_unittest.cc
+++ b/content/browser/service_worker/service_worker_database_unittest.cc
@@ -253,8 +253,11 @@ TEST(ServiceWorkerDatabaseTest, GetOriginsWithRegistrations) {
 
   // |origin3| has another registration, so should not remove it from the
   // unique origin list.
+  int64 version_id;
   ASSERT_EQ(ServiceWorkerDatabase::STATUS_OK,
-            database->DeleteRegistration(data4.registration_id, origin3,
+            database->DeleteRegistration(data4.registration_id,
+                                         origin3,
+                                         &version_id,
                                          &newly_purgeable_resources));
 
   origins.clear();
@@ -267,7 +270,9 @@ TEST(ServiceWorkerDatabaseTest, GetOriginsWithRegistrations) {
 
   // |origin3| should be removed from the unique origin list.
   ASSERT_EQ(ServiceWorkerDatabase::STATUS_OK,
-            database->DeleteRegistration(data3.registration_id, origin3,
+            database->DeleteRegistration(data3.registration_id,
+                                         origin3,
+                                         &version_id,
                                          &newly_purgeable_resources));
 
   origins.clear();
@@ -445,8 +450,11 @@ TEST(ServiceWorkerDatabaseTest, Registration_Basic) {
             database->GetUncommittedResourceIds(&uncommitted_ids_out));
   EXPECT_TRUE(uncommitted_ids_out.empty());
 
+  int64 version_id;
   EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
-            database->DeleteRegistration(data.registration_id, origin,
+            database->DeleteRegistration(data.registration_id,
+                                         origin,
+                                         &version_id,
                                          &newly_purgeable_resources));
   ASSERT_EQ(resources.size(), newly_purgeable_resources.size());
   for (size_t i = 0; i < resources.size(); ++i)
@@ -581,8 +589,11 @@ TEST(ServiceWorkerDatabaseTest, Registration_Multiple) {
   EXPECT_TRUE(purgeable_ids_out.empty());
 
   // Delete registration1.
+  int64 version_id;
   EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
-            database->DeleteRegistration(data1.registration_id, origin,
+            database->DeleteRegistration(data1.registration_id,
+                                         origin,
+                                         &version_id,
                                          &newly_purgeable_resources));
 
   // Make sure that registration1 is gone.
@@ -652,8 +663,11 @@ TEST(ServiceWorkerDatabaseTest, UpdateVersionToActive) {
   EXPECT_TRUE(resources_out.empty());
 
   // Delete the registration.
+  int64 version_id;
   EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
-            database->DeleteRegistration(data.registration_id, origin,
+            database->DeleteRegistration(data.registration_id,
+                                         origin,
+                                         &version_id,
                                          &newly_purgeable_resources));
 
   // Should be false because the registration is gone.
@@ -707,8 +721,11 @@ TEST(ServiceWorkerDatabaseTest, UpdateLastCheckTime) {
   EXPECT_TRUE(resources_out.empty());
 
   // Delete the registration.
+  int64 version_id;
   EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
-            database->DeleteRegistration(data.registration_id, origin,
+            database->DeleteRegistration(data.registration_id,
+                                         origin,
+                                         &version_id,
                                          &newly_purgeable_resources));
 
   // Should be false because the registration is gone.