Eagerly delete replaced notifications from the database

content/browser/notifications/notification_database.cc

 // Copyright 2015 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/notifications/notification_database.h"
 
 #include <string>
 
 #include "base/files/file_util.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 218 matching lines @@
   DCHECK_GE(notification_id, kFirstNotificationId);
   DCHECK(origin.is_valid());
 
   std::string key = CreateDataKey(origin, notification_id);
   return LevelDBStatusToStatus(db_->Delete(leveldb::WriteOptions(), key));
 }
 
 NotificationDatabase::Status
 NotificationDatabase::DeleteAllNotificationDataForOrigin(
     const GURL& origin,
+    const std::string& tag,
     std::set<int64_t>* deleted_notification_set) {
-  return DeleteAllNotificationDataInternal(
-      origin, kInvalidServiceWorkerRegistrationId, deleted_notification_set);
+  return DeleteAllNotificationDataInternal(origin, tag,
+                                           kInvalidServiceWorkerRegistrationId,
+                                           deleted_notification_set);
 }
 
 NotificationDatabase::Status
 NotificationDatabase::DeleteAllNotificationDataForServiceWorkerRegistration(
     const GURL& origin,
     int64_t service_worker_registration_id,
     std::set<int64_t>* deleted_notification_set) {
-  return DeleteAllNotificationDataInternal(
-      origin, service_worker_registration_id, deleted_notification_set);
+  return DeleteAllNotificationDataInternal(origin, "" /* tag */,
+                                           service_worker_registration_id,
+                                           deleted_notification_set);
 }
 
 NotificationDatabase::Status NotificationDatabase::Destroy() {
   DCHECK(sequence_checker_.CalledOnValidSequence());
 
   leveldb::Options options;
   if (IsInMemoryDatabase()) {
     if (!env_)
       return STATUS_OK;  // The database has not been initialized.
 
@@ skipping 60 matching lines @@
 
     notification_data_vector->push_back(notification_database_data);
   }
 
   return LevelDBStatusToStatus(iter->status());
 }
 
 NotificationDatabase::Status
 NotificationDatabase::DeleteAllNotificationDataInternal(
     const GURL& origin,
+    const std::string& tag,
     int64_t service_worker_registration_id,
     std::set<int64_t>* deleted_notification_set) {
   DCHECK(sequence_checker_.CalledOnValidSequence());
   DCHECK(deleted_notification_set);
   DCHECK(origin.is_valid());
 
   const std::string prefix = CreateDataPrefix(origin);
+  const bool should_deserialize =
+      service_worker_registration_id != kInvalidServiceWorkerRegistrationId ||
+      !tag.empty();
 
   leveldb::Slice prefix_slice(prefix);
   leveldb::WriteBatch batch;
 
   NotificationDatabaseData notification_database_data;
   std::unique_ptr<leveldb::Iterator> iter(
       db_->NewIterator(leveldb::ReadOptions()));
   for (iter->Seek(prefix_slice); iter->Valid(); iter->Next()) {
     if (!iter->key().starts_with(prefix_slice))
       break;
 
-    if (service_worker_registration_id != kInvalidServiceWorkerRegistrationId) {
+    if (should_deserialize) {
       Status status = DeserializedNotificationData(iter->value().ToString(),
                                                    &notification_database_data);
       if (status != STATUS_OK)
         return status;
 
-      if (notification_database_data.service_worker_registration_id !=
-          service_worker_registration_id) {
+      if (!tag.empty() &&
+          notification_database_data.notification_data.tag != tag) {
+        continue;
+      }
+
+      if (service_worker_registration_id !=
+              kInvalidServiceWorkerRegistrationId &&
+          notification_database_data.service_worker_registration_id !=
+              service_worker_registration_id) {
         continue;
       }
     }
 
     leveldb::Slice notification_id_slice = iter->key();
     notification_id_slice.remove_prefix(prefix_slice.size());
 
     int64_t notification_id = 0;
     if (!base::StringToInt64(notification_id_slice.ToString(),
                              &notification_id)) {
       return STATUS_ERROR_CORRUPTED;
     }
 
     deleted_notification_set->insert(notification_id);
     batch.Delete(iter->key());
   }
 
   if (deleted_notification_set->empty())
     return STATUS_OK;
 
   return LevelDBStatusToStatus(db_->Write(leveldb::WriteOptions(), &batch));
 }
 
 }  // namespace content