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

Side by Side Diff: ios/chrome/browser/sync/sync_setup_service_factory.cc

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 "ios/chrome/browser/sync/sync_setup_service_factory.h" 5 #include "ios/chrome/browser/sync/sync_setup_service_factory.h"
6 6
7 #include "base/memory/ptr_util.h"
7 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
8 #include "components/browser_sync/browser/profile_sync_service.h" 9 #include "components/browser_sync/browser/profile_sync_service.h"
9 #include "components/keyed_service/ios/browser_state_dependency_manager.h" 10 #include "components/keyed_service/ios/browser_state_dependency_manager.h"
10 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" 11 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
11 #include "ios/chrome/browser/sync/ios_chrome_profile_sync_service_factory.h" 12 #include "ios/chrome/browser/sync/ios_chrome_profile_sync_service_factory.h"
12 #include "ios/chrome/browser/sync/sync_setup_service.h" 13 #include "ios/chrome/browser/sync/sync_setup_service.h"
13 14
14 // static 15 // static
15 SyncSetupService* SyncSetupServiceFactory::GetForBrowserState( 16 SyncSetupService* SyncSetupServiceFactory::GetForBrowserState(
16 ios::ChromeBrowserState* browser_state) { 17 ios::ChromeBrowserState* browser_state) {
(...skipping 16 matching lines...) Expand all
33 SyncSetupServiceFactory::SyncSetupServiceFactory() 34 SyncSetupServiceFactory::SyncSetupServiceFactory()
34 : BrowserStateKeyedServiceFactory( 35 : BrowserStateKeyedServiceFactory(
35 "SyncSetupService", 36 "SyncSetupService",
36 BrowserStateDependencyManager::GetInstance()) { 37 BrowserStateDependencyManager::GetInstance()) {
37 DependsOn(IOSChromeProfileSyncServiceFactory::GetInstance()); 38 DependsOn(IOSChromeProfileSyncServiceFactory::GetInstance());
38 } 39 }
39 40
40 SyncSetupServiceFactory::~SyncSetupServiceFactory() { 41 SyncSetupServiceFactory::~SyncSetupServiceFactory() {
41 } 42 }
42 43
43 scoped_ptr<KeyedService> SyncSetupServiceFactory::BuildServiceInstanceFor( 44 std::unique_ptr<KeyedService> SyncSetupServiceFactory::BuildServiceInstanceFor(
44 web::BrowserState* context) const { 45 web::BrowserState* context) const {
45 ios::ChromeBrowserState* browser_state = 46 ios::ChromeBrowserState* browser_state =
46 ios::ChromeBrowserState::FromBrowserState(context); 47 ios::ChromeBrowserState::FromBrowserState(context);
47 return make_scoped_ptr(new SyncSetupService( 48 return base::WrapUnique(new SyncSetupService(
48 IOSChromeProfileSyncServiceFactory::GetForBrowserState(browser_state), 49 IOSChromeProfileSyncServiceFactory::GetForBrowserState(browser_state),
49 browser_state->GetPrefs())); 50 browser_state->GetPrefs()));
50 } 51 }
OLDNEW
« no previous file with comments | « ios/chrome/browser/sync/sync_setup_service_factory.h ('k') | ios/chrome/browser/tab_parenting_global_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698