| Index: chrome/browser/sync_file_system/drive_backend/list_changes_task.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc b/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc
|
| index de9b3cce8df12d24d4799b29ab8225651072cbf9..bf8b86a2700cab834256b6ad94cc543a2ff8f810 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc
|
| @@ -5,7 +5,7 @@
|
| #include "chrome/browser/sync_file_system/drive_backend/list_changes_task.h"
|
|
|
| #include <stddef.h>
|
| -
|
| +#include <utility>
|
| #include <vector>
|
|
|
| #include "base/bind.h"
|
| @@ -39,13 +39,12 @@ void ListChangesTask::RunPreflight(scoped_ptr<SyncTaskToken> token) {
|
|
|
| if (!IsContextReady()) {
|
| token->RecordLog("Failed to get required service.");
|
| - SyncTaskManager::NotifyTaskDone(token.Pass(), SYNC_STATUS_FAILED);
|
| + SyncTaskManager::NotifyTaskDone(std::move(token), SYNC_STATUS_FAILED);
|
| return;
|
| }
|
|
|
| SyncTaskManager::UpdateTaskBlocker(
|
| - token.Pass(),
|
| - scoped_ptr<TaskBlocker>(new TaskBlocker),
|
| + std::move(token), scoped_ptr<TaskBlocker>(new TaskBlocker),
|
| base::Bind(&ListChangesTask::StartListing,
|
| weak_ptr_factory_.GetWeakPtr()));
|
| }
|
| @@ -64,15 +63,15 @@ void ListChangesTask::DidListChanges(
|
| SyncStatusCode status = DriveApiErrorCodeToSyncStatusCode(error);
|
| if (status != SYNC_STATUS_OK) {
|
| token->RecordLog("Failed to fetch change list.");
|
| - SyncTaskManager::NotifyTaskDone(
|
| - token.Pass(), SYNC_STATUS_NETWORK_ERROR);
|
| + SyncTaskManager::NotifyTaskDone(std::move(token),
|
| + SYNC_STATUS_NETWORK_ERROR);
|
| return;
|
| }
|
|
|
| if (!change_list) {
|
| NOTREACHED();
|
| token->RecordLog("Got invalid change list.");
|
| - SyncTaskManager::NotifyTaskDone(token.Pass(), SYNC_STATUS_FAILED);
|
| + SyncTaskManager::NotifyTaskDone(std::move(token), SYNC_STATUS_FAILED);
|
| return;
|
| }
|
|
|
| @@ -95,16 +94,15 @@ void ListChangesTask::DidListChanges(
|
|
|
| if (change_list_.empty()) {
|
| token->RecordLog("Got no change.");
|
| - SyncTaskManager::NotifyTaskDone(
|
| - token.Pass(), SYNC_STATUS_NO_CHANGE_TO_SYNC);
|
| + SyncTaskManager::NotifyTaskDone(std::move(token),
|
| + SYNC_STATUS_NO_CHANGE_TO_SYNC);
|
| return;
|
| }
|
|
|
| scoped_ptr<TaskBlocker> task_blocker(new TaskBlocker);
|
| task_blocker->exclusive = true;
|
| SyncTaskManager::UpdateTaskBlocker(
|
| - token.Pass(),
|
| - task_blocker.Pass(),
|
| + std::move(token), std::move(task_blocker),
|
| base::Bind(&ListChangesTask::CheckInChangeList,
|
| weak_ptr_factory_.GetWeakPtr(),
|
| change_list->largest_change_id()));
|
| @@ -121,16 +119,15 @@ void ListChangesTask::CheckInChangeList(int64_t largest_change_id,
|
| for (size_t i = 0; i < change_list_.size(); ++i)
|
| file_ids_.push_back(change_list_[i]->file_id());
|
|
|
| - SyncStatusCode status =
|
| - metadata_database()->UpdateByChangeList(
|
| - largest_change_id, change_list_.Pass());
|
| + SyncStatusCode status = metadata_database()->UpdateByChangeList(
|
| + largest_change_id, std::move(change_list_));
|
| if (status != SYNC_STATUS_OK) {
|
| - SyncTaskManager::NotifyTaskDone(token.Pass(), status);
|
| + SyncTaskManager::NotifyTaskDone(std::move(token), status);
|
| return;
|
| }
|
|
|
| status = metadata_database()->SweepDirtyTrackers(file_ids_);
|
| - SyncTaskManager::NotifyTaskDone(token.Pass(), status);
|
| + SyncTaskManager::NotifyTaskDone(std::move(token), status);
|
| }
|
|
|
| bool ListChangesTask::IsContextReady() {
|
|
|