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

Side by Side Diff: chrome/browser/sync_file_system/sync_file_system_service_factory.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 4 years, 11 months 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h" 5 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility>
8 9
9 #include "base/command_line.h" 10 #include "base/command_line.h"
10 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/sync_file_system/local/local_file_sync_service.h" 12 #include "chrome/browser/sync_file_system/local/local_file_sync_service.h"
12 #include "chrome/browser/sync_file_system/sync_file_system_service.h" 13 #include "chrome/browser/sync_file_system/sync_file_system_service.h"
13 #include "chrome/browser/sync_file_system/syncable_file_system_util.h" 14 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"
14 #include "components/keyed_service/content/browser_context_dependency_manager.h" 15 #include "components/keyed_service/content/browser_context_dependency_manager.h"
15 #include "extensions/browser/extension_registry_factory.h" 16 #include "extensions/browser/extension_registry_factory.h"
16 17
17 namespace sync_file_system { 18 namespace sync_file_system {
18 19
19 // static 20 // static
20 SyncFileSystemService* SyncFileSystemServiceFactory::GetForProfile( 21 SyncFileSystemService* SyncFileSystemServiceFactory::GetForProfile(
21 Profile* profile) { 22 Profile* profile) {
22 return static_cast<SyncFileSystemService*>( 23 return static_cast<SyncFileSystemService*>(
23 GetInstance()->GetServiceForBrowserContext(profile, true)); 24 GetInstance()->GetServiceForBrowserContext(profile, true));
24 } 25 }
25 26
26 // static 27 // static
27 SyncFileSystemServiceFactory* SyncFileSystemServiceFactory::GetInstance() { 28 SyncFileSystemServiceFactory* SyncFileSystemServiceFactory::GetInstance() {
28 return base::Singleton<SyncFileSystemServiceFactory>::get(); 29 return base::Singleton<SyncFileSystemServiceFactory>::get();
29 } 30 }
30 31
31 void SyncFileSystemServiceFactory::set_mock_local_file_service( 32 void SyncFileSystemServiceFactory::set_mock_local_file_service(
32 scoped_ptr<LocalFileSyncService> mock_local_service) { 33 scoped_ptr<LocalFileSyncService> mock_local_service) {
33 mock_local_file_service_ = mock_local_service.Pass(); 34 mock_local_file_service_ = std::move(mock_local_service);
34 } 35 }
35 36
36 void SyncFileSystemServiceFactory::set_mock_remote_file_service( 37 void SyncFileSystemServiceFactory::set_mock_remote_file_service(
37 scoped_ptr<RemoteFileSyncService> mock_remote_service) { 38 scoped_ptr<RemoteFileSyncService> mock_remote_service) {
38 mock_remote_file_service_ = mock_remote_service.Pass(); 39 mock_remote_file_service_ = std::move(mock_remote_service);
39 } 40 }
40 41
41 SyncFileSystemServiceFactory::SyncFileSystemServiceFactory() 42 SyncFileSystemServiceFactory::SyncFileSystemServiceFactory()
42 : BrowserContextKeyedServiceFactory( 43 : BrowserContextKeyedServiceFactory(
43 "SyncFileSystemService", 44 "SyncFileSystemService",
44 BrowserContextDependencyManager::GetInstance()) { 45 BrowserContextDependencyManager::GetInstance()) {
45 typedef std::set<BrowserContextKeyedServiceFactory*> FactorySet; 46 typedef std::set<BrowserContextKeyedServiceFactory*> FactorySet;
46 FactorySet factories; 47 FactorySet factories;
47 factories.insert(extensions::ExtensionRegistryFactory::GetInstance()); 48 factories.insert(extensions::ExtensionRegistryFactory::GetInstance());
48 RemoteFileSyncService::AppendDependsOnFactories(&factories); 49 RemoteFileSyncService::AppendDependsOnFactories(&factories);
49 for (FactorySet::iterator iter = factories.begin(); 50 for (FactorySet::iterator iter = factories.begin();
50 iter != factories.end(); 51 iter != factories.end();
51 ++iter) { 52 ++iter) {
52 DependsOn(*iter); 53 DependsOn(*iter);
53 } 54 }
54 } 55 }
55 56
56 SyncFileSystemServiceFactory::~SyncFileSystemServiceFactory() {} 57 SyncFileSystemServiceFactory::~SyncFileSystemServiceFactory() {}
57 58
58 KeyedService* SyncFileSystemServiceFactory::BuildServiceInstanceFor( 59 KeyedService* SyncFileSystemServiceFactory::BuildServiceInstanceFor(
59 content::BrowserContext* context) const { 60 content::BrowserContext* context) const {
60 Profile* profile = Profile::FromBrowserContext(context); 61 Profile* profile = Profile::FromBrowserContext(context);
61 62
62 SyncFileSystemService* service = new SyncFileSystemService(profile); 63 SyncFileSystemService* service = new SyncFileSystemService(profile);
63 64
64 scoped_ptr<LocalFileSyncService> local_file_service; 65 scoped_ptr<LocalFileSyncService> local_file_service;
65 if (mock_local_file_service_) 66 if (mock_local_file_service_)
66 local_file_service = mock_local_file_service_.Pass(); 67 local_file_service = std::move(mock_local_file_service_);
67 else 68 else
68 local_file_service = LocalFileSyncService::Create(profile); 69 local_file_service = LocalFileSyncService::Create(profile);
69 70
70 scoped_ptr<RemoteFileSyncService> remote_file_service; 71 scoped_ptr<RemoteFileSyncService> remote_file_service;
71 if (mock_remote_file_service_) { 72 if (mock_remote_file_service_) {
72 remote_file_service = mock_remote_file_service_.Pass(); 73 remote_file_service = std::move(mock_remote_file_service_);
73 } else { 74 } else {
74 remote_file_service = RemoteFileSyncService::CreateForBrowserContext( 75 remote_file_service = RemoteFileSyncService::CreateForBrowserContext(
75 context, service->task_logger()); 76 context, service->task_logger());
76 } 77 }
77 78
78 service->Initialize(local_file_service.Pass(), 79 service->Initialize(std::move(local_file_service),
79 remote_file_service.Pass()); 80 std::move(remote_file_service));
80 return service; 81 return service;
81 } 82 }
82 83
83 } // namespace sync_file_system 84 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698