Don't prematurely delete script resources when registration is deleted

content/browser/service_worker/service_worker_database.cc

 // Copyright 2014 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_database.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/location.h"
@@ skipping 579 matching lines @@
 
   registration.last_update_check = time;
 
   leveldb::WriteBatch batch;
   PutRegistrationDataToBatch(registration, &batch);
   return WriteBatch(&batch);
 }
 
 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))
     return STATUS_OK;
   if (status != STATUS_OK)
     return status;
   if (!origin.is_valid())
     return STATUS_ERROR_FAILED;
 
   leveldb::WriteBatch batch;
 
   // Remove |origin| from unique origins if a registration specified by
   // |registration_id| is the only one for |origin|.
   // TODO(nhiroki): Check the uniqueness by more efficient way.
   std::vector<RegistrationData> registrations;
   status = GetRegistrationsForOrigin(origin, &registrations);
   if (status != STATUS_OK)
     return status;
 
   if (registrations.size() == 1 &&
       registrations[0].registration_id == registration_id) {
     batch.Delete(CreateUniqueOriginKey(origin));
   }
 
   // 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);
 }
 
 ServiceWorkerDatabase::Status
 ServiceWorkerDatabase::GetUncommittedResourceIds(std::set<int64>* ids) {
   return ReadResourceIds(kUncommittedResIdKeyPrefix, ids);
 }
 
 ServiceWorkerDatabase::Status
@@ skipping 454 matching lines @@
     const tracked_objects::Location& from_here,
     Status status) {
   if (status != ServiceWorkerDatabase::STATUS_OK)
     Disable(from_here, status);
   UMA_HISTOGRAM_ENUMERATION(kWriteResultHistogramLabel,
                             status,
                             ServiceWorkerDatabase::STATUS_ERROR_MAX);
 }
 
 }  // namespace content