Index: chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc |
diff --git a/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc b/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc |
index c6efe8dc91a0077701d8c767f240aa391f5bd7fb..08dcb77b7b36158d7f9bff7e17a703f46f43e8ad 100644 |
--- a/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc |
+++ b/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc |
@@ -6,7 +6,7 @@ |
#include <stddef.h> |
#include <stdint.h> |
- |
+#include <utility> |
#include <vector> |
#include "base/files/scoped_temp_dir.h" |
@@ -62,12 +62,10 @@ class RegisterAppTaskTest : public testing::Test { |
fake_drive_service.get(), drive_uploader.get(), |
kSyncRootFolderTitle)); |
- context_.reset(new SyncEngineContext(fake_drive_service.Pass(), |
- drive_uploader.Pass(), |
- nullptr /* task_logger */, |
- base::ThreadTaskRunnerHandle::Get(), |
- base::ThreadTaskRunnerHandle::Get(), |
- nullptr /* worker_pool */)); |
+ context_.reset(new SyncEngineContext( |
+ std::move(fake_drive_service), std::move(drive_uploader), |
+ nullptr /* task_logger */, base::ThreadTaskRunnerHandle::Get(), |
+ base::ThreadTaskRunnerHandle::Get(), nullptr /* worker_pool */)); |
ASSERT_EQ(google_apis::HTTP_CREATED, |
fake_drive_service_helper_->AddOrphanedFolder( |
@@ -126,10 +124,11 @@ class RegisterAppTaskTest : public testing::Test { |
ASSERT_TRUE(db); |
ASSERT_FALSE(context_->GetMetadataDatabase()); |
scoped_ptr<MetadataDatabase> metadata_db; |
- ASSERT_EQ(SYNC_STATUS_OK, |
- MetadataDatabase::CreateForTesting( |
- db.Pass(), true /* enable_on_disk_index */, &metadata_db)); |
- context_->SetMetadataDatabase(metadata_db.Pass()); |
+ ASSERT_EQ( |
+ SYNC_STATUS_OK, |
+ MetadataDatabase::CreateForTesting( |
+ std::move(db), true /* enable_on_disk_index */, &metadata_db)); |
+ context_->SetMetadataDatabase(std::move(metadata_db)); |
} |
SyncStatusCode RunRegisterAppTask(const std::string& app_id) { |
@@ -285,7 +284,7 @@ TEST_F(RegisterAppTaskTest, AlreadyRegistered) { |
const std::string kAppID = "app_id"; |
SetUpRegisteredAppRoot(kAppID, db.get()); |
- CreateMetadataDatabase(db.Pass()); |
+ CreateMetadataDatabase(std::move(db)); |
EXPECT_EQ(SYNC_STATUS_OK, RunRegisterAppTask(kAppID)); |
EXPECT_EQ(1u, CountRegisteredAppRoot()); |
@@ -298,7 +297,7 @@ TEST_F(RegisterAppTaskTest, CreateAppFolder) { |
SetUpInitialData(db.get()); |
const std::string kAppID = "app_id"; |
- CreateMetadataDatabase(db.Pass()); |
+ CreateMetadataDatabase(std::move(db)); |
RunRegisterAppTask(kAppID); |
EXPECT_EQ(1u, CountRegisteredAppRoot()); |
@@ -317,7 +316,7 @@ TEST_F(RegisterAppTaskTest, RegisterExistingFolder) { |
const std::string kAppID = "app_id"; |
SetUpUnregisteredAppRoot(kAppID, db.get()); |
- CreateMetadataDatabase(db.Pass()); |
+ CreateMetadataDatabase(std::move(db)); |
RunRegisterAppTask(kAppID); |
EXPECT_EQ(1u, CountRegisteredAppRoot()); |
@@ -333,7 +332,7 @@ TEST_F(RegisterAppTaskTest, RegisterExistingFolder_MultipleCandidate) { |
SetUpUnregisteredAppRoot(kAppID, db.get()); |
SetUpUnregisteredAppRoot(kAppID, db.get()); |
- CreateMetadataDatabase(db.Pass()); |
+ CreateMetadataDatabase(std::move(db)); |
RunRegisterAppTask(kAppID); |
EXPECT_EQ(1u, CountRegisteredAppRoot()); |