| Index: chrome/browser/sync_file_system/drive_backend/sync_task.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task.cc b/chrome/browser/sync_file_system/drive_backend/sync_task.cc
|
| index a9727afa3baf35b66dd18b35c3f104d8ce41ec95..1092019ee0489e38d2a3df120b6182d98a0cb290 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/sync_task.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/sync_task.cc
|
| @@ -17,7 +17,7 @@ namespace drive_backend {
|
| namespace {
|
|
|
| void CallRunExclusive(const base::WeakPtr<ExclusiveTask>& task,
|
| - scoped_ptr<SyncTaskToken> token) {
|
| + std::unique_ptr<SyncTaskToken> token) {
|
| if (task)
|
| task->RunExclusive(SyncTaskToken::WrapToCallback(std::move(token)));
|
| }
|
| @@ -27,8 +27,8 @@ void CallRunExclusive(const base::WeakPtr<ExclusiveTask>& task,
|
| ExclusiveTask::ExclusiveTask() : weak_ptr_factory_(this) {}
|
| ExclusiveTask::~ExclusiveTask() {}
|
|
|
| -void ExclusiveTask::RunPreflight(scoped_ptr<SyncTaskToken> token) {
|
| - scoped_ptr<TaskBlocker> task_blocker(new TaskBlocker);
|
| +void ExclusiveTask::RunPreflight(std::unique_ptr<SyncTaskToken> token) {
|
| + std::unique_ptr<TaskBlocker> task_blocker(new TaskBlocker);
|
| task_blocker->exclusive = true;
|
|
|
| SyncTaskManager::UpdateTaskBlocker(
|
|
|