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

Unified Diff: chrome/browser/sync_file_system/drive_backend/sync_task_manager.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
Index: chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc b/chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc
index 49ef56605b7b64de4fcc7a331dea434c63fe327c..acdb242094c308a931a5d656494b07867b36abd8 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc
@@ -79,7 +79,7 @@ SyncTaskManager::~SyncTaskManager() {
}
void SyncTaskManager::Initialize(SyncStatusCode status) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
DCHECK(!token_);
NotifyTaskDone(
SyncTaskToken::CreateForForegroundTask(
@@ -92,7 +92,7 @@ void SyncTaskManager::ScheduleTask(
const Task& task,
Priority priority,
const SyncStatusCallback& callback) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
ScheduleSyncTask(from_here,
std::unique_ptr<SyncTask>(new SyncTaskAdapter(task)),
@@ -104,7 +104,7 @@ void SyncTaskManager::ScheduleSyncTask(
std::unique_ptr<SyncTask> task,
Priority priority,
const SyncStatusCallback& callback) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
std::unique_ptr<SyncTaskToken> token(GetToken(from_here, callback));
if (!token) {
@@ -122,7 +122,7 @@ bool SyncTaskManager::ScheduleTaskIfIdle(
const tracked_objects::Location& from_here,
const Task& task,
const SyncStatusCallback& callback) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
return ScheduleSyncTaskIfIdle(
from_here, std::unique_ptr<SyncTask>(new SyncTaskAdapter(task)),
@@ -133,7 +133,7 @@ bool SyncTaskManager::ScheduleSyncTaskIfIdle(
const tracked_objects::Location& from_here,
std::unique_ptr<SyncTask> task,
const SyncStatusCallback& callback) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
std::unique_ptr<SyncTaskToken> token(GetToken(from_here, callback));
if (!token)
@@ -192,7 +192,7 @@ void SyncTaskManager::UpdateTaskBlocker(
}
bool SyncTaskManager::IsRunningTask(int64_t token_id) const {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
// If the client is gone, all task should be aborted.
if (!client_)
@@ -214,7 +214,7 @@ bool SyncTaskManager::ShouldTrackTaskToken() const {
void SyncTaskManager::NotifyTaskDoneBody(std::unique_ptr<SyncTaskToken> token,
SyncStatusCode status) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
DCHECK(token);
DVLOG(3) << "NotifyTaskDone: " << "finished with status=" << status
@@ -270,7 +270,7 @@ void SyncTaskManager::UpdateTaskBlockerBody(
std::unique_ptr<TaskLogger::TaskLog> task_log,
std::unique_ptr<TaskBlocker> task_blocker,
const Continuation& continuation) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
// Run the task directly if the parallelization is disabled.
if (!maximum_background_task_) {
@@ -356,7 +356,7 @@ void SyncTaskManager::UpdateTaskBlockerBody(
std::unique_ptr<SyncTaskToken> SyncTaskManager::GetToken(
const tracked_objects::Location& from_here,
const SyncStatusCallback& callback) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
if (!token_)
return nullptr;
@@ -366,14 +366,14 @@ std::unique_ptr<SyncTaskToken> SyncTaskManager::GetToken(
void SyncTaskManager::PushPendingTask(
const base::Closure& closure, Priority priority) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
pending_tasks_.push(PendingTask(closure, priority, pending_task_seq_++));
}
void SyncTaskManager::RunTask(std::unique_ptr<SyncTaskToken> token,
std::unique_ptr<SyncTask> task) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
DCHECK(!running_foreground_task_);
running_foreground_task_ = std::move(task);
@@ -382,7 +382,7 @@ void SyncTaskManager::RunTask(std::unique_ptr<SyncTaskToken> token,
void SyncTaskManager::MaybeStartNextForegroundTask(
std::unique_ptr<SyncTaskToken> token) {
- DCHECK(sequence_checker_.CalledOnValidSequencedThread());
+ DCHECK(sequence_checker_.CalledOnValidSequence());
if (token) {
DCHECK(!token_);

Powered by Google App Engine
This is Rietveld 408576698