Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/service_worker/service_worker_database.cc

Issue 2189113002: Rename CalledOnValidSequencedThread() to CalledOnValidSequence(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/notifications/notification_database.cc ('k') | gpu/command_buffer/service/in_process_command_buffer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 6fba23431e87d7f67802bddacd9d4833542b0ab6..a7923bc9c93d2b0e8a829cd538956dec3bb0f532 100644
--- a/content/browser/service_worker/service_worker_database.cc
+++ b/content/browser/service_worker/service_worker_database.cc
@@ -300,7 +300,7 @@ ServiceWorkerDatabase::ServiceWorkerDatabase(const base::FilePath& path)
}
ServiceWorkerDatabase::~ServiceWorkerDatabase() {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
db_.reset();
}
@@ -308,7 +308,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::GetNextAvailableIds(
int64_t* next_avail_registration_id,
int64_t* next_avail_version_id,
int64_t* next_avail_resource_id) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
DCHECK(next_avail_registration_id);
DCHECK(next_avail_version_id);
DCHECK(next_avail_resource_id);
@@ -341,7 +341,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::GetNextAvailableIds(
ServiceWorkerDatabase::Status
ServiceWorkerDatabase::GetOriginsWithRegistrations(std::set<GURL>* origins) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
DCHECK(origins->empty());
Status status = LazyOpen(false);
@@ -382,7 +382,7 @@ ServiceWorkerDatabase::GetOriginsWithRegistrations(std::set<GURL>* origins) {
ServiceWorkerDatabase::Status
ServiceWorkerDatabase::GetOriginsWithForeignFetchRegistrations(
std::set<GURL>* origins) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
DCHECK(origins->empty());
Status status = LazyOpen(false);
@@ -425,7 +425,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::GetRegistrationsForOrigin(
const GURL& origin,
std::vector<RegistrationData>* registrations,
std::vector<std::vector<ResourceRecord>>* opt_resources_list) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
DCHECK(registrations->empty());
Status status = LazyOpen(false);
@@ -479,7 +479,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::GetRegistrationsForOrigin(
ServiceWorkerDatabase::Status ServiceWorkerDatabase::GetAllRegistrations(
std::vector<RegistrationData>* registrations) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
DCHECK(registrations->empty());
Status status = LazyOpen(false);
@@ -520,7 +520,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadRegistration(
const GURL& origin,
RegistrationData* registration,
std::vector<ResourceRecord>* resources) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
DCHECK(registration);
DCHECK(resources);
@@ -550,7 +550,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadRegistration(
ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadRegistrationOrigin(
int64_t registration_id,
GURL* origin) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
DCHECK(origin);
Status status = LazyOpen(true);
@@ -586,7 +586,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::WriteRegistration(
const std::vector<ResourceRecord>& resources,
RegistrationData* old_registration,
std::vector<int64_t>* newly_purgeable_resources) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
DCHECK(old_registration);
DCHECK(!resources.empty());
Status status = LazyOpen(true);
@@ -688,7 +688,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::WriteRegistration(
ServiceWorkerDatabase::Status ServiceWorkerDatabase::UpdateVersionToActive(
int64_t registration_id,
const GURL& origin) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
Status status = LazyOpen(false);
if (IsNewOrNonexistentDatabase(status))
return STATUS_ERROR_NOT_FOUND;
@@ -713,7 +713,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::UpdateLastCheckTime(
int64_t registration_id,
const GURL& origin,
const base::Time& time) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
Status status = LazyOpen(false);
if (IsNewOrNonexistentDatabase(status))
return STATUS_ERROR_NOT_FOUND;
@@ -739,7 +739,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::DeleteRegistration(
const GURL& origin,
RegistrationData* deleted_version,
std::vector<int64_t>* newly_purgeable_resources) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
DCHECK(deleted_version);
deleted_version->version_id = kInvalidServiceWorkerVersionId;
Status status = LazyOpen(false);
@@ -805,7 +805,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadUserData(
int64_t registration_id,
const std::vector<std::string>& user_data_names,
std::vector<std::string>* user_data_values) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
DCHECK_NE(kInvalidServiceWorkerRegistrationId, registration_id);
DCHECK(!user_data_names.empty());
DCHECK(user_data_values);
@@ -836,7 +836,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::WriteUserData(
int64_t registration_id,
const GURL& origin,
const std::vector<std::pair<std::string, std::string>>& name_value_pairs) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
DCHECK_NE(kInvalidServiceWorkerRegistrationId, registration_id);
DCHECK(!name_value_pairs.empty());
@@ -864,7 +864,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::WriteUserData(
ServiceWorkerDatabase::Status ServiceWorkerDatabase::DeleteUserData(
int64_t registration_id,
const std::vector<std::string>& user_data_names) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
DCHECK_NE(kInvalidServiceWorkerRegistrationId, registration_id);
DCHECK(!user_data_names.empty());
@@ -887,7 +887,7 @@ ServiceWorkerDatabase::Status
ServiceWorkerDatabase::ReadUserDataForAllRegistrations(
const std::string& user_data_name,
std::vector<std::pair<int64_t, std::string>>* user_data) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
DCHECK(user_data->empty());
Status status = LazyOpen(false);
@@ -984,7 +984,7 @@ ServiceWorkerDatabase::PurgeUncommittedResourceIds(
ServiceWorkerDatabase::Status ServiceWorkerDatabase::DeleteAllDataForOrigins(
const std::set<GURL>& origins,
std::vector<int64_t>* newly_purgeable_resources) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
Status status = LazyOpen(false);
if (IsNewOrNonexistentDatabase(status))
return STATUS_OK;
@@ -1027,7 +1027,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::DeleteAllDataForOrigins(
}
ServiceWorkerDatabase::Status ServiceWorkerDatabase::DestroyDatabase() {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
Disable(FROM_HERE, STATUS_OK);
if (IsDatabaseInMemory()) {
@@ -1047,7 +1047,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::DestroyDatabase() {
ServiceWorkerDatabase::Status ServiceWorkerDatabase::LazyOpen(
bool create_if_missing) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
// Do not try to open a database if we tried and failed once.
if (state_ == DISABLED)
@@ -1397,7 +1397,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::DeleteResourceRecords(
ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadResourceIds(
const char* id_key_prefix,
std::set<int64_t>* ids) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
DCHECK(id_key_prefix);
DCHECK(ids->empty());
@@ -1439,7 +1439,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::WriteResourceIdsInBatch(
const char* id_key_prefix,
const std::set<int64_t>& ids,
leveldb::WriteBatch* batch) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
DCHECK(id_key_prefix);
Status status = LazyOpen(true);
@@ -1462,7 +1462,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::DeleteResourceIdsInBatch(
const char* id_key_prefix,
const std::set<int64_t>& ids,
leveldb::WriteBatch* batch) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
DCHECK(id_key_prefix);
Status status = LazyOpen(false);
« no previous file with comments | « content/browser/notifications/notification_database.cc ('k') | gpu/command_buffer/service/in_process_command_buffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698