ServiceWorker: Add check for id overlap between pushed and deleted resources

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 cfedd00dd4f944aaa7395aaa24ad7a6bbb5b5ad9..0702b50bd5b99449bfa9dd535e575a1313264f19 100644
--- a/content/browser/service_worker/service_worker_database.cc
+++ b/content/browser/service_worker/service_worker_database.cc
@@ -9,6 +9,7 @@
 #include "base/file_util.h"
 #include "base/location.h"
 #include "base/logging.h"
+#include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ -423,31 +424,9 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::WriteRegistration(
   BumpNextRegistrationIdIfNeeded(registration.registration_id, &batch);
   BumpNextVersionIdIfNeeded(registration.version_id, &batch);
 
-  // TODO(nhiroki): Skip to add the origin into the unique origin list if it
-  // has already been added.
   PutUniqueOriginToBatch(registration.scope.GetOrigin(), &batch);
-
   PutRegistrationDataToBatch(registration, &batch);
 
-  // Retrieve a previous version to sweep purgeable resources.
-  RegistrationData old_registration;
-  status = ReadRegistrationData(registration.registration_id,
-                                registration.scope.GetOrigin(),
-                                &old_registration);
-  if (status != STATUS_OK && status != STATUS_ERROR_NOT_FOUND)
-    return status;
-  if (status == STATUS_OK) {
-    DCHECK_LT(old_registration.version_id, registration.version_id);
-    // Currently resource sharing across versions and registrations is not
-    // suppported, so resource ids should not be overlapped between
-    // |registration| and |old_registration|.
-    // TODO(nhiroki): Add DCHECK to make sure the overlap does not exist.
-    status = DeleteResourceRecords(
-        old_registration.version_id, newly_purgeable_resources, &batch);
-    if (status != STATUS_OK)
-      return status;
-  }
-
   // Used for avoiding multiple writes for the same resource id or url.
   std::set<int64> pushed_resources;
   std::set<GURL> pushed_urls;
@@ -467,6 +446,29 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::WriteRegistration(
         kUncommittedResIdKeyPrefix, itr->resource_id));
   }
 
+  // Retrieve a previous version to sweep purgeable resources.
+  RegistrationData old_registration;
+  status = ReadRegistrationData(registration.registration_id,
+                                registration.scope.GetOrigin(),
+                                &old_registration);
+  if (status != STATUS_OK && status != STATUS_ERROR_NOT_FOUND)
+    return status;
+  if (status == STATUS_OK) {
+    DCHECK_LT(old_registration.version_id, registration.version_id);
+    status = DeleteResourceRecords(
+        old_registration.version_id, newly_purgeable_resources, &batch);
+    if (status != STATUS_OK)
+      return status;
+
+    // Currently resource sharing across versions and registrations is not
+    // supported, so resource ids should not be overlapped between
+    // |registration| and |old_registration|.
+    std::set<int64> deleted_resources(newly_purgeable_resources->begin(),
+                                      newly_purgeable_resources->end());
+    DCHECK(base::STLSetIntersection<std::set<int64> >(
+        pushed_resources, deleted_resources).empty());
+  }
+
   return WriteBatch(&batch);
 }