Don't prematurely delete script resources when registration is deleted

content/browser/service_worker/service_worker_database.cc

Index: content/browser/service_worker/service_worker_database.cc
diff --git a/content/browser/service_worker/service_worker_database.cc b/content/browser/service_worker/service_worker_database.cc
index 1058acc6165d6d414fbd91c3e731238093b10a80..0f792f280cf110e0651116adbfc559e2b5c7cd35 100644
--- a/content/browser/service_worker/service_worker_database.cc
+++ b/content/browser/service_worker/service_worker_database.cc
@@ -597,8 +597,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::UpdateLastCheckTime(
 
 ServiceWorkerDatabase::Status ServiceWorkerDatabase::DeleteRegistration(
     int64 registration_id,
-    const GURL& origin,
-    std::vector<int64>* newly_purgeable_resources) {
+    const GURL& origin) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   Status status = LazyOpen(false);
   if (IsNewOrNonexistentDatabase(status))
@@ -626,17 +625,24 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::DeleteRegistration(
   // Delete a registration specified by |registration_id|.
   batch.Delete(CreateRegistrationKey(registration_id, origin));
 
-  // Delete resource records associated with the registration.

[michaeln, 2014/06/28 02:29:31]

We do want to delete the records from the 'resource' table at this time. 

-  for (std::vector<RegistrationData>::const_iterator itr =
-           registrations.begin(); itr != registrations.end(); ++itr) {
-    if (itr->registration_id == registration_id) {
-      status = DeleteResourceRecords(
-          itr->version_id, newly_purgeable_resources, &batch);
-      if (status != STATUS_OK)
-        return status;
-      break;
-    }
-  }
+  return WriteBatch(&batch);
+}
+
+ServiceWorkerDatabase::Status ServiceWorkerDatabase::DeleteVersionResources(
+    int64 version_id,
+    std::vector<int64>* newly_purgeable_resources) {
+  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+  Status status = LazyOpen(false);
+  if (IsNewOrNonexistentDatabase(status))
+    return STATUS_OK;
+  if (status != STATUS_OK)
+    return status;
+
+  leveldb::WriteBatch batch;
+
+  status = DeleteResourceRecords(version_id, newly_purgeable_resources, &batch);
+  if (status != STATUS_OK)
+    return status;
 
   return WriteBatch(&batch);
 }