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

Unified Diff: chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc

Issue 608133002: [SyncFS] Use nullptr for scoped_ptr initialization (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nullptr
Patch Set: Created 6 years, 3 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 aba018799ecb7b7be3fc5146dcabd808e09264dd..37d6bf95649f9d8dcfc9616901b01b00c6641752 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
@@ -291,7 +291,7 @@ void SyncTaskManager::UpdateTaskBlockerBody(
base::Passed(&task_blocker),
continuation),
PRIORITY_HIGH);
- MaybeStartNextForegroundTask(scoped_ptr<SyncTaskToken>());
+ MaybeStartNextForegroundTask(nullptr);
return;
}
}
@@ -337,7 +337,7 @@ void SyncTaskManager::UpdateTaskBlockerBody(
}
token_ = foreground_task_token.Pass();
- MaybeStartNextForegroundTask(scoped_ptr<SyncTaskToken>());
+ MaybeStartNextForegroundTask(nullptr);
background_task_token->SetTaskLog(task_log.Pass());
continuation.Run(background_task_token.Pass());
}
@@ -348,7 +348,7 @@ scoped_ptr<SyncTaskToken> SyncTaskManager::GetToken(
DCHECK(sequence_checker_.CalledOnValidSequencedThread());
if (!token_)
- return scoped_ptr<SyncTaskToken>();
+ return nullptr;
token_->UpdateTask(from_here, callback);
return token_.Pass();
}

Powered by Google App Engine
This is Rietveld 408576698