| Index: chrome/browser/sync_file_system/sync_file_system_service_factory.cc
|
| diff --git a/chrome/browser/sync_file_system/sync_file_system_service_factory.cc b/chrome/browser/sync_file_system/sync_file_system_service_factory.cc
|
| index 410f7d14c3c8c765a9836aadc61801229569073c..0730652ac09f49b9fd9425713a1b7a0440224d24 100644
|
| --- a/chrome/browser/sync_file_system/sync_file_system_service_factory.cc
|
| +++ b/chrome/browser/sync_file_system/sync_file_system_service_factory.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h"
|
|
|
| #include <set>
|
| +#include <utility>
|
|
|
| #include "base/command_line.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| @@ -30,12 +31,12 @@ SyncFileSystemServiceFactory* SyncFileSystemServiceFactory::GetInstance() {
|
|
|
| void SyncFileSystemServiceFactory::set_mock_local_file_service(
|
| scoped_ptr<LocalFileSyncService> mock_local_service) {
|
| - mock_local_file_service_ = mock_local_service.Pass();
|
| + mock_local_file_service_ = std::move(mock_local_service);
|
| }
|
|
|
| void SyncFileSystemServiceFactory::set_mock_remote_file_service(
|
| scoped_ptr<RemoteFileSyncService> mock_remote_service) {
|
| - mock_remote_file_service_ = mock_remote_service.Pass();
|
| + mock_remote_file_service_ = std::move(mock_remote_service);
|
| }
|
|
|
| SyncFileSystemServiceFactory::SyncFileSystemServiceFactory()
|
| @@ -63,20 +64,20 @@ KeyedService* SyncFileSystemServiceFactory::BuildServiceInstanceFor(
|
|
|
| scoped_ptr<LocalFileSyncService> local_file_service;
|
| if (mock_local_file_service_)
|
| - local_file_service = mock_local_file_service_.Pass();
|
| + local_file_service = std::move(mock_local_file_service_);
|
| else
|
| local_file_service = LocalFileSyncService::Create(profile);
|
|
|
| scoped_ptr<RemoteFileSyncService> remote_file_service;
|
| if (mock_remote_file_service_) {
|
| - remote_file_service = mock_remote_file_service_.Pass();
|
| + remote_file_service = std::move(mock_remote_file_service_);
|
| } else {
|
| remote_file_service = RemoteFileSyncService::CreateForBrowserContext(
|
| context, service->task_logger());
|
| }
|
|
|
| - service->Initialize(local_file_service.Pass(),
|
| - remote_file_service.Pass());
|
| + service->Initialize(std::move(local_file_service),
|
| + std::move(remote_file_service));
|
| return service;
|
| }
|
|
|
|
|