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

Side by Side Diff: chrome/browser/sync_file_system/sync_file_system_service_factory.cc

Issue 1873683002: Convert //chrome/browser/sync_file_system from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 #include <utility>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 12 matching lines...) Expand all
23 return static_cast<SyncFileSystemService*>( 23 return static_cast<SyncFileSystemService*>(
24 GetInstance()->GetServiceForBrowserContext(profile, true)); 24 GetInstance()->GetServiceForBrowserContext(profile, true));
25 } 25 }
26 26
27 // static 27 // static
28 SyncFileSystemServiceFactory* SyncFileSystemServiceFactory::GetInstance() { 28 SyncFileSystemServiceFactory* SyncFileSystemServiceFactory::GetInstance() {
29 return base::Singleton<SyncFileSystemServiceFactory>::get(); 29 return base::Singleton<SyncFileSystemServiceFactory>::get();
30 } 30 }
31 31
32 void SyncFileSystemServiceFactory::set_mock_local_file_service( 32 void SyncFileSystemServiceFactory::set_mock_local_file_service(
33 scoped_ptr<LocalFileSyncService> mock_local_service) { 33 std::unique_ptr<LocalFileSyncService> mock_local_service) {
34 mock_local_file_service_ = std::move(mock_local_service); 34 mock_local_file_service_ = std::move(mock_local_service);
35 } 35 }
36 36
37 void SyncFileSystemServiceFactory::set_mock_remote_file_service( 37 void SyncFileSystemServiceFactory::set_mock_remote_file_service(
38 scoped_ptr<RemoteFileSyncService> mock_remote_service) { 38 std::unique_ptr<RemoteFileSyncService> mock_remote_service) {
39 mock_remote_file_service_ = std::move(mock_remote_service); 39 mock_remote_file_service_ = std::move(mock_remote_service);
40 } 40 }
41 41
42 SyncFileSystemServiceFactory::SyncFileSystemServiceFactory() 42 SyncFileSystemServiceFactory::SyncFileSystemServiceFactory()
43 : BrowserContextKeyedServiceFactory( 43 : BrowserContextKeyedServiceFactory(
44 "SyncFileSystemService", 44 "SyncFileSystemService",
45 BrowserContextDependencyManager::GetInstance()) { 45 BrowserContextDependencyManager::GetInstance()) {
46 typedef std::set<BrowserContextKeyedServiceFactory*> FactorySet; 46 typedef std::set<BrowserContextKeyedServiceFactory*> FactorySet;
47 FactorySet factories; 47 FactorySet factories;
48 factories.insert(extensions::ExtensionRegistryFactory::GetInstance()); 48 factories.insert(extensions::ExtensionRegistryFactory::GetInstance());
49 RemoteFileSyncService::AppendDependsOnFactories(&factories); 49 RemoteFileSyncService::AppendDependsOnFactories(&factories);
50 for (FactorySet::iterator iter = factories.begin(); 50 for (FactorySet::iterator iter = factories.begin();
51 iter != factories.end(); 51 iter != factories.end();
52 ++iter) { 52 ++iter) {
53 DependsOn(*iter); 53 DependsOn(*iter);
54 } 54 }
55 } 55 }
56 56
57 SyncFileSystemServiceFactory::~SyncFileSystemServiceFactory() {} 57 SyncFileSystemServiceFactory::~SyncFileSystemServiceFactory() {}
58 58
59 KeyedService* SyncFileSystemServiceFactory::BuildServiceInstanceFor( 59 KeyedService* SyncFileSystemServiceFactory::BuildServiceInstanceFor(
60 content::BrowserContext* context) const { 60 content::BrowserContext* context) const {
61 Profile* profile = Profile::FromBrowserContext(context); 61 Profile* profile = Profile::FromBrowserContext(context);
62 62
63 SyncFileSystemService* service = new SyncFileSystemService(profile); 63 SyncFileSystemService* service = new SyncFileSystemService(profile);
64 64
65 scoped_ptr<LocalFileSyncService> local_file_service; 65 std::unique_ptr<LocalFileSyncService> local_file_service;
66 if (mock_local_file_service_) 66 if (mock_local_file_service_)
67 local_file_service = std::move(mock_local_file_service_); 67 local_file_service = std::move(mock_local_file_service_);
68 else 68 else
69 local_file_service = LocalFileSyncService::Create(profile); 69 local_file_service = LocalFileSyncService::Create(profile);
70 70
71 scoped_ptr<RemoteFileSyncService> remote_file_service; 71 std::unique_ptr<RemoteFileSyncService> remote_file_service;
72 if (mock_remote_file_service_) { 72 if (mock_remote_file_service_) {
73 remote_file_service = std::move(mock_remote_file_service_); 73 remote_file_service = std::move(mock_remote_file_service_);
74 } else { 74 } else {
75 remote_file_service = RemoteFileSyncService::CreateForBrowserContext( 75 remote_file_service = RemoteFileSyncService::CreateForBrowserContext(
76 context, service->task_logger()); 76 context, service->task_logger());
77 } 77 }
78 78
79 service->Initialize(std::move(local_file_service), 79 service->Initialize(std::move(local_file_service),
80 std::move(remote_file_service)); 80 std::move(remote_file_service));
81 return service; 81 return service;
82 } 82 }
83 83
84 } // namespace sync_file_system 84 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698