OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/signin/account_consistency_service_factory.h" | 5 #include "ios/chrome/browser/signin/account_consistency_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/keyed_service/ios/browser_state_dependency_manager.h" | 9 #include "components/keyed_service/ios/browser_state_dependency_manager.h" |
9 #include "components/signin/ios/browser/account_consistency_service.h" | 10 #include "components/signin/ios/browser/account_consistency_service.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/content_settings/cookie_settings_factory.h" | 12 #include "ios/chrome/browser/content_settings/cookie_settings_factory.h" |
12 #include "ios/chrome/browser/signin/account_reconcilor_factory.h" | 13 #include "ios/chrome/browser/signin/account_reconcilor_factory.h" |
13 #include "ios/chrome/browser/signin/gaia_cookie_manager_service_factory.h" | 14 #include "ios/chrome/browser/signin/gaia_cookie_manager_service_factory.h" |
14 #include "ios/chrome/browser/signin/signin_client_factory.h" | 15 #include "ios/chrome/browser/signin/signin_client_factory.h" |
15 #include "ios/chrome/browser/signin/signin_manager_factory.h" | 16 #include "ios/chrome/browser/signin/signin_manager_factory.h" |
16 | 17 |
(...skipping 23 matching lines...) Expand all Loading... |
40 AccountConsistencyServiceFactory* | 41 AccountConsistencyServiceFactory* |
41 AccountConsistencyServiceFactory::GetInstance() { | 42 AccountConsistencyServiceFactory::GetInstance() { |
42 return base::Singleton<AccountConsistencyServiceFactory>::get(); | 43 return base::Singleton<AccountConsistencyServiceFactory>::get(); |
43 } | 44 } |
44 | 45 |
45 void AccountConsistencyServiceFactory::RegisterBrowserStatePrefs( | 46 void AccountConsistencyServiceFactory::RegisterBrowserStatePrefs( |
46 user_prefs::PrefRegistrySyncable* registry) { | 47 user_prefs::PrefRegistrySyncable* registry) { |
47 AccountConsistencyService::RegisterPrefs(registry); | 48 AccountConsistencyService::RegisterPrefs(registry); |
48 } | 49 } |
49 | 50 |
50 scoped_ptr<KeyedService> | 51 std::unique_ptr<KeyedService> |
51 AccountConsistencyServiceFactory::BuildServiceInstanceFor( | 52 AccountConsistencyServiceFactory::BuildServiceInstanceFor( |
52 web::BrowserState* context) const { | 53 web::BrowserState* context) const { |
53 ios::ChromeBrowserState* chrome_browser_state = | 54 ios::ChromeBrowserState* chrome_browser_state = |
54 ios::ChromeBrowserState::FromBrowserState(context); | 55 ios::ChromeBrowserState::FromBrowserState(context); |
55 return make_scoped_ptr(new AccountConsistencyService( | 56 return base::WrapUnique(new AccountConsistencyService( |
56 chrome_browser_state, | 57 chrome_browser_state, |
57 ios::AccountReconcilorFactory::GetForBrowserState(chrome_browser_state), | 58 ios::AccountReconcilorFactory::GetForBrowserState(chrome_browser_state), |
58 ios::CookieSettingsFactory::GetForBrowserState(chrome_browser_state), | 59 ios::CookieSettingsFactory::GetForBrowserState(chrome_browser_state), |
59 GaiaCookieManagerServiceFactory::GetForBrowserState(chrome_browser_state), | 60 GaiaCookieManagerServiceFactory::GetForBrowserState(chrome_browser_state), |
60 SigninClientFactory::GetForBrowserState(chrome_browser_state), | 61 SigninClientFactory::GetForBrowserState(chrome_browser_state), |
61 ios::SigninManagerFactory::GetForBrowserState(chrome_browser_state))); | 62 ios::SigninManagerFactory::GetForBrowserState(chrome_browser_state))); |
62 } | 63 } |
63 | 64 |
64 } // namespace ios | 65 } // namespace ios |
OLD | NEW |