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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync_file_system/drive_backend/sync_worker.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 | « chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc ('k') | chrome/browser/task_management/sampling/task_group_sampler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync_file_system/drive_backend/sync_worker.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_worker.cc b/chrome/browser/sync_file_system/drive_backend/sync_worker.cc
index ed0c3e0b35e043cc63cec1926da9d0456cde3e5e..c97826b6a21398167d8e988a87f2ac6d80c70208 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_worker.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_worker.cc
@@ -67,7 +67,7 @@ SyncWorker::~SyncWorker() {
}
void SyncWorker::Initialize(std::unique_ptr<SyncEngineContext> context) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
DCHECK(!task_manager_);
context_ = std::move(context);
@@ -84,7 +84,7 @@ void SyncWorker::Initialize(std::unique_ptr<SyncEngineContext> context) {
void SyncWorker::RegisterOrigin(
const GURL& origin,
const SyncStatusCallback& callback) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
if (!GetMetadataDatabase())
PostInitializeTask();
@@ -103,7 +103,7 @@ void SyncWorker::RegisterOrigin(
void SyncWorker::EnableOrigin(
const GURL& origin,
const SyncStatusCallback& callback) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
task_manager_->ScheduleTask(
FROM_HERE,
@@ -117,7 +117,7 @@ void SyncWorker::EnableOrigin(
void SyncWorker::DisableOrigin(
const GURL& origin,
const SyncStatusCallback& callback) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
task_manager_->ScheduleTask(
FROM_HERE,
@@ -132,7 +132,7 @@ void SyncWorker::UninstallOrigin(
const GURL& origin,
RemoteFileSyncService::UninstallFlag flag,
const SyncStatusCallback& callback) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
task_manager_->ScheduleSyncTask(
FROM_HERE, std::unique_ptr<SyncTask>(
@@ -141,7 +141,7 @@ void SyncWorker::UninstallOrigin(
}
void SyncWorker::ProcessRemoteChange(const SyncFileCallback& callback) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
RemoteToLocalSyncer* syncer = new RemoteToLocalSyncer(context_.get());
task_manager_->ScheduleSyncTask(
@@ -153,13 +153,13 @@ void SyncWorker::ProcessRemoteChange(const SyncFileCallback& callback) {
void SyncWorker::SetRemoteChangeProcessor(
RemoteChangeProcessorOnWorker* remote_change_processor_on_worker) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
context_->SetRemoteChangeProcessor(remote_change_processor_on_worker);
}
RemoteServiceState SyncWorker::GetCurrentState() const {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
if (!sync_enabled_)
return REMOTE_SERVICE_DISABLED;
@@ -168,7 +168,7 @@ RemoteServiceState SyncWorker::GetCurrentState() const {
void SyncWorker::GetOriginStatusMap(
const RemoteFileSyncService::StatusMapCallback& callback) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
if (!GetMetadataDatabase())
return;
@@ -190,7 +190,7 @@ void SyncWorker::GetOriginStatusMap(
}
std::unique_ptr<base::ListValue> SyncWorker::DumpFiles(const GURL& origin) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
if (!GetMetadataDatabase())
return std::unique_ptr<base::ListValue>();
@@ -198,7 +198,7 @@ std::unique_ptr<base::ListValue> SyncWorker::DumpFiles(const GURL& origin) {
}
std::unique_ptr<base::ListValue> SyncWorker::DumpDatabase() {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
if (!GetMetadataDatabase())
return std::unique_ptr<base::ListValue>();
@@ -206,7 +206,7 @@ std::unique_ptr<base::ListValue> SyncWorker::DumpDatabase() {
}
void SyncWorker::SetSyncEnabled(bool enabled) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
if (sync_enabled_ == enabled)
return;
@@ -225,7 +225,7 @@ void SyncWorker::SetSyncEnabled(bool enabled) {
}
void SyncWorker::PromoteDemotedChanges(const base::Closure& callback) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
MetadataDatabase* metadata_db = GetMetadataDatabase();
if (metadata_db && metadata_db->HasDemotedDirtyTracker()) {
@@ -243,7 +243,7 @@ void SyncWorker::ApplyLocalChange(const FileChange& local_change,
const SyncFileMetadata& local_metadata,
const storage::FileSystemURL& url,
const SyncStatusCallback& callback) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
LocalToRemoteSyncer* syncer = new LocalToRemoteSyncer(
context_.get(), local_metadata, local_change, local_path, url);
@@ -255,7 +255,7 @@ void SyncWorker::ApplyLocalChange(const FileChange& local_change,
}
void SyncWorker::MaybeScheduleNextTask() {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
if (GetCurrentState() == REMOTE_SERVICE_DISABLED)
return;
@@ -277,7 +277,7 @@ void SyncWorker::MaybeScheduleNextTask() {
void SyncWorker::NotifyLastOperationStatus(
SyncStatusCode status,
bool used_network) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
UpdateServiceStateFromSyncStatusCode(status, used_network);
@@ -289,7 +289,7 @@ void SyncWorker::NotifyLastOperationStatus(
}
void SyncWorker::RecordTaskLog(std::unique_ptr<TaskLogger::TaskLog> task_log) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
context_->GetUITaskRunner()->PostTask(
FROM_HERE,
@@ -300,7 +300,7 @@ void SyncWorker::RecordTaskLog(std::unique_ptr<TaskLogger::TaskLog> task_log) {
void SyncWorker::ActivateService(RemoteServiceState service_state,
const std::string& description) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
UpdateServiceState(service_state, description);
if (!GetMetadataDatabase()) {
PostInitializeTask();
@@ -312,7 +312,7 @@ void SyncWorker::ActivateService(RemoteServiceState service_state,
}
void SyncWorker::DeactivateService(const std::string& description) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
UpdateServiceState(REMOTE_SERVICE_TEMPORARY_UNAVAILABLE, description);
}
@@ -328,7 +328,7 @@ void SyncWorker::AddObserver(Observer* observer) {
void SyncWorker::DoDisableApp(const std::string& app_id,
const SyncStatusCallback& callback) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
if (!GetMetadataDatabase()) {
callback.Run(SYNC_STATUS_OK);
@@ -341,7 +341,7 @@ void SyncWorker::DoDisableApp(const std::string& app_id,
void SyncWorker::DoEnableApp(const std::string& app_id,
const SyncStatusCallback& callback) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
if (!GetMetadataDatabase()) {
callback.Run(SYNC_STATUS_OK);
@@ -353,7 +353,7 @@ void SyncWorker::DoEnableApp(const std::string& app_id,
}
void SyncWorker::PostInitializeTask() {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
DCHECK(!GetMetadataDatabase());
// This initializer task may not run if MetadataDatabase in context_ is
@@ -371,7 +371,7 @@ void SyncWorker::PostInitializeTask() {
void SyncWorker::DidInitialize(SyncEngineInitializer* initializer,
SyncStatusCode status) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
if (status == SYNC_STATUS_ACCESS_FORBIDDEN) {
UpdateServiceState(REMOTE_SERVICE_ACCESS_FORBIDDEN, "Access forbidden");
@@ -396,7 +396,7 @@ void SyncWorker::DidInitialize(SyncEngineInitializer* initializer,
void SyncWorker::UpdateRegisteredApps() {
MetadataDatabase* metadata_db = GetMetadataDatabase();
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
DCHECK(metadata_db);
std::unique_ptr<std::vector<std::string>> app_ids(
@@ -446,7 +446,7 @@ void SyncWorker::QueryAppStatusOnUIThread(
}
void SyncWorker::DidQueryAppStatus(const AppStatusMap* app_status) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
MetadataDatabase* metadata_db = GetMetadataDatabase();
DCHECK(metadata_db);
@@ -488,7 +488,7 @@ void SyncWorker::DidQueryAppStatus(const AppStatusMap* app_status) {
void SyncWorker::DidProcessRemoteChange(RemoteToLocalSyncer* syncer,
const SyncFileCallback& callback,
SyncStatusCode status) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
if (syncer->is_sync_root_deletion()) {
MetadataDatabase::ClearDatabase(context_->PassMetadataDatabase());
@@ -523,7 +523,7 @@ void SyncWorker::DidProcessRemoteChange(RemoteToLocalSyncer* syncer,
void SyncWorker::DidApplyLocalChange(LocalToRemoteSyncer* syncer,
const SyncStatusCallback& callback,
SyncStatusCode status) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
if ((status == SYNC_STATUS_OK || status == SYNC_STATUS_RETRY) &&
syncer->url().is_valid() &&
@@ -568,7 +568,7 @@ void SyncWorker::DidApplyLocalChange(LocalToRemoteSyncer* syncer,
}
bool SyncWorker::MaybeStartFetchChanges() {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
if (GetCurrentState() == REMOTE_SERVICE_DISABLED)
return false;
@@ -608,14 +608,14 @@ bool SyncWorker::MaybeStartFetchChanges() {
}
void SyncWorker::DidResolveConflict(SyncStatusCode status) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
if (status == SYNC_STATUS_OK || status == SYNC_STATUS_RETRY)
should_check_conflict_ = true;
}
void SyncWorker::DidFetchChanges(SyncStatusCode status) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
if (status == SYNC_STATUS_OK)
should_check_conflict_ = true;
@@ -668,7 +668,7 @@ void SyncWorker::UpdateServiceStateFromSyncStatusCode(
void SyncWorker::UpdateServiceState(RemoteServiceState state,
const std::string& description) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
RemoteServiceState old_state = GetCurrentState();
service_state_ = state;
@@ -698,17 +698,17 @@ void SyncWorker::CallOnIdleForTesting(const base::Closure& callback) {
}
drive::DriveServiceInterface* SyncWorker::GetDriveService() {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
return context_->GetDriveService();
}
drive::DriveUploaderInterface* SyncWorker::GetDriveUploader() {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
return context_->GetDriveUploader();
}
MetadataDatabase* SyncWorker::GetMetadataDatabase() {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
return context_->GetMetadataDatabase();
}
« no previous file with comments | « chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc ('k') | chrome/browser/task_management/sampling/task_group_sampler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698