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

Unified Diff: chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.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_engine_initializer_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc
index aac13d8f519b145b1b00f2e444ccf8ddad2ea17c..2ac832122456f3451ac12a4b4456e27ccff0b7f7 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
#include <stdint.h>
+#include <utility>
#include "base/bind.h"
#include "base/files/scoped_temp_dir.h"
@@ -57,12 +58,10 @@ class SyncEngineInitializerTest : public testing::Test {
fake_drive_service_ = fake_drive_service.get();
sync_context_.reset(new SyncEngineContext(
- fake_drive_service.Pass(),
- scoped_ptr<drive::DriveUploaderInterface>(),
- nullptr /* task_logger */,
+ std::move(fake_drive_service),
+ scoped_ptr<drive::DriveUploaderInterface>(), nullptr /* task_logger */,
base::ThreadTaskRunnerHandle::Get(),
- base::ThreadTaskRunnerHandle::Get(),
- nullptr /* worker_pool */));
+ base::ThreadTaskRunnerHandle::Get(), nullptr /* worker_pool */));
sync_task_manager_.reset(new SyncTaskManager(
base::WeakPtr<SyncTaskManager::Client>(),
@@ -146,7 +145,7 @@ class SyncEngineInitializerTest : public testing::Test {
base::RunLoop().RunUntilIdle();
EXPECT_EQ(google_apis::HTTP_CREATED, error);
- return entry.Pass();
+ return entry;
}
scoped_ptr<google_apis::FileResource> CreateRemoteSyncRoot() {
@@ -163,7 +162,7 @@ class SyncEngineInitializerTest : public testing::Test {
EXPECT_EQ(google_apis::HTTP_NO_CONTENT, error);
}
- return sync_root.Pass();
+ return sync_root;
}
std::string GetSyncRootFolderID() {

Powered by Google App Engine
This is Rietveld 408576698