Chromium Code Reviews| 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..b9bef022d979db645d198093d4d413a3756affbc 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 /* token */); |
|
peria
2014/09/29 02:32:27
nit: remove this inline comment
tzik
2014/09/29 18:34:53
Done.
|
| return; |
| } |
| } |
| @@ -337,7 +337,7 @@ void SyncTaskManager::UpdateTaskBlockerBody( |
| } |
| token_ = foreground_task_token.Pass(); |
| - MaybeStartNextForegroundTask(scoped_ptr<SyncTaskToken>()); |
| + MaybeStartNextForegroundTask(nullptr /* token */); |
|
peria
2014/09/29 02:32:27
nit: ditto
tzik
2014/09/29 18:34:53
Done.
|
| 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(); |
| } |