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

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

Issue 1545283002: Convert Pass()→std::move() in //chrome/browser/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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_worker.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_worker.cc b/chrome/browser/sync_file_system/drive_backend/sync_worker.cc
index 1cb1c4e08cfc181e3cc040ca1493f7db88432fc8..f7b67b2a36400791650ba9bb4216390224662fa1 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_worker.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_worker.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/sync_file_system/drive_backend/sync_worker.h"
+#include <utility>
#include <vector>
#include "base/bind.h"
@@ -69,7 +70,7 @@ void SyncWorker::Initialize(scoped_ptr<SyncEngineContext> context) {
DCHECK(sequence_checker_.CalledOnValidSequencedThread());
DCHECK(!task_manager_);
- context_ = context.Pass();
+ context_ = std::move(context);
task_manager_.reset(new SyncTaskManager(
weak_ptr_factory_.GetWeakPtr(), 0 /* maximum_background_task */,
@@ -95,8 +96,8 @@ void SyncWorker::RegisterOrigin(
return;
}
- task_manager_->ScheduleSyncTask(
- FROM_HERE, task.Pass(), SyncTaskManager::PRIORITY_HIGH, callback);
+ task_manager_->ScheduleSyncTask(FROM_HERE, std::move(task),
+ SyncTaskManager::PRIORITY_HIGH, callback);
}
void SyncWorker::EnableOrigin(
@@ -190,7 +191,7 @@ void SyncWorker::GetOriginStatusMap(
GetMetadataDatabase()->IsAppEnabled(app_id) ? "Enabled" : "Disabled";
}
- callback.Run(status_map.Pass());
+ callback.Run(std::move(status_map));
}
scoped_ptr<base::ListValue> SyncWorker::DumpFiles(const GURL& origin) {
@@ -395,7 +396,7 @@ void SyncWorker::DidInitialize(SyncEngineInitializer* initializer,
scoped_ptr<MetadataDatabase> metadata_database =
initializer->PassMetadataDatabase();
if (metadata_database) {
- context_->SetMetadataDatabase(metadata_database.Pass());
+ context_->SetMetadataDatabase(std::move(metadata_database));
return;
}

Powered by Google App Engine
This is Rietveld 408576698