Rename CalledOnValidSequencedThread() to CalledOnValidSequence().

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 83 matching lines @@
   DLOG(ERROR) << "Unable to deserialize a notification's data.";
   return NotificationDatabase::STATUS_ERROR_CORRUPTED;
 }
 
 }  // namespace
 
 NotificationDatabase::NotificationDatabase(const base::FilePath& path)
     : path_(path) {}
 
 NotificationDatabase::~NotificationDatabase() {
-  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+  DCHECK(sequence_checker_.CalledOnValidSequence());
 }
 
 NotificationDatabase::Status NotificationDatabase::Open(
     bool create_if_missing) {
-  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+  DCHECK(sequence_checker_.CalledOnValidSequence());
   DCHECK_EQ(STATE_UNINITIALIZED, state_);
 
   if (!create_if_missing) {
     if (IsInMemoryDatabase() || !base::PathExists(path_) ||
         base::IsDirectoryEmpty(path_)) {
       return NotificationDatabase::STATUS_ERROR_NOT_FOUND;
     }
   }
 
   filter_policy_.reset(leveldb::NewBloomFilterPolicy(10));
@@ skipping 17 matching lines @@
   state_ = STATE_INITIALIZED;
   db_.reset(db);
 
   return ReadNextNotificationId();
 }
 
 NotificationDatabase::Status NotificationDatabase::ReadNotificationData(
     int64_t notification_id,
     const GURL& origin,
     NotificationDatabaseData* notification_database_data) const {
-  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+  DCHECK(sequence_checker_.CalledOnValidSequence());
   DCHECK_EQ(STATE_INITIALIZED, state_);
   DCHECK_GE(notification_id, kFirstNotificationId);
   DCHECK(origin.is_valid());
   DCHECK(notification_database_data);
 
   std::string key = CreateDataKey(origin, notification_id);
   std::string serialized_data;
 
   Status status = LevelDBStatusToStatus(
       db_->Get(leveldb::ReadOptions(), key, &serialized_data));
@@ skipping 25 matching lines @@
     int64_t service_worker_registration_id,
     std::vector<NotificationDatabaseData>* notification_data_vector) const {
   return ReadAllNotificationDataInternal(origin, service_worker_registration_id,
                                          notification_data_vector);
 }
 
 NotificationDatabase::Status NotificationDatabase::WriteNotificationData(
     const GURL& origin,
     const NotificationDatabaseData& notification_database_data,
     int64_t* notification_id) {
-  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+  DCHECK(sequence_checker_.CalledOnValidSequence());
   DCHECK_EQ(STATE_INITIALIZED, state_);
   DCHECK(notification_id);
   DCHECK(origin.is_valid());
 
   DCHECK_GE(next_notification_id_, kFirstNotificationId);
 
   NotificationDatabaseData storage_data = notification_database_data;
   storage_data.notification_id = next_notification_id_;
 
   std::string serialized_data;
@@ skipping 13 matching lines @@
   if (status != STATUS_OK)
     return status;
 
   *notification_id = next_notification_id_++;
   return STATUS_OK;
 }
 
 NotificationDatabase::Status NotificationDatabase::DeleteNotificationData(
     int64_t notification_id,
     const GURL& origin) {
-  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+  DCHECK(sequence_checker_.CalledOnValidSequence());
   DCHECK_EQ(STATE_INITIALIZED, state_);
   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,
     std::set<int64_t>* deleted_notification_set) {
   return DeleteAllNotificationDataInternal(
       origin, 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);
 }
 
 NotificationDatabase::Status NotificationDatabase::Destroy() {
-  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+  DCHECK(sequence_checker_.CalledOnValidSequence());
 
   leveldb::Options options;
   if (IsInMemoryDatabase()) {
     if (!env_)
       return STATUS_OK;  // The database has not been initialized.
 
     options.env = env_.get();
   }
 
   state_ = STATE_DISABLED;
@@ skipping 22 matching lines @@
   }
 
   return STATUS_OK;
 }
 
 NotificationDatabase::Status
 NotificationDatabase::ReadAllNotificationDataInternal(
     const GURL& origin,
     int64_t service_worker_registration_id,
     std::vector<NotificationDatabaseData>* notification_data_vector) const {
-  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+  DCHECK(sequence_checker_.CalledOnValidSequence());
   DCHECK(notification_data_vector);
 
   const std::string prefix = CreateDataPrefix(origin);
 
   leveldb::Slice prefix_slice(prefix);
 
   NotificationDatabaseData notification_database_data;
   std::unique_ptr<leveldb::Iterator> iter(
       db_->NewIterator(leveldb::ReadOptions()));
   for (iter->Seek(prefix_slice); iter->Valid(); iter->Next()) {
@@ skipping 15 matching lines @@
   }
 
   return LevelDBStatusToStatus(iter->status());
 }
 
 NotificationDatabase::Status
 NotificationDatabase::DeleteAllNotificationDataInternal(
     const GURL& origin,
     int64_t service_worker_registration_id,
     std::set<int64_t>* deleted_notification_set) {
-  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+  DCHECK(sequence_checker_.CalledOnValidSequence());
   DCHECK(deleted_notification_set);
   DCHECK(origin.is_valid());
 
   const std::string prefix = CreateDataPrefix(origin);
 
   leveldb::Slice prefix_slice(prefix);
   leveldb::WriteBatch batch;
 
   NotificationDatabaseData notification_database_data;
   std::unique_ptr<leveldb::Iterator> iter(
@@ skipping 27 matching lines @@
     batch.Delete(iter->key());
   }
 
   if (deleted_notification_set->empty())
     return STATUS_OK;
 
   return LevelDBStatusToStatus(db_->Write(leveldb::WriteOptions(), &batch));
 }
 
 }  // namespace content