| Index: chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc
|
| index c0804d193fa23857a369c845ad9578c238657bb4..edfdd1f7e3aa229228d872c044143e2a8cedcda3 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/bind.h"
|
| #include "base/callback.h"
|
| #include "base/files/scoped_temp_dir.h"
|
| @@ -70,12 +72,10 @@ class LocalToRemoteSyncerTest : public testing::Test {
|
| kSyncRootFolderTitle));
|
| remote_change_processor_.reset(new FakeRemoteChangeProcessor);
|
|
|
| - 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 */));
|
| context_->SetRemoteChangeProcessor(remote_change_processor_.get());
|
|
|
| RegisterSyncableFileSystem();
|
| @@ -221,7 +221,7 @@ class LocalToRemoteSyncerTest : public testing::Test {
|
| EXPECT_EQ(google_apis::HTTP_SUCCESS,
|
| fake_drive_helper_->SearchByTitle(
|
| parent_folder_id, title, &entries));
|
| - return entries.Pass();
|
| + return entries;
|
| }
|
|
|
| std::string GetFileIDForParentAndTitle(const std::string& parent_folder_id,
|
|
|