| 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_reconcilor_factory.h" | 5 #include "ios/chrome/browser/signin/account_reconcilor_factory.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/memory/singleton.h" | 9 #include "base/memory/singleton.h" |
| 10 #include "components/keyed_service/ios/browser_state_dependency_manager.h" | 10 #include "components/keyed_service/ios/browser_state_dependency_manager.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 ios::ChromeBrowserState* browser_state) { | 34 ios::ChromeBrowserState* browser_state) { |
| 35 return static_cast<AccountReconcilor*>( | 35 return static_cast<AccountReconcilor*>( |
| 36 GetInstance()->GetServiceForBrowserState(browser_state, true)); | 36 GetInstance()->GetServiceForBrowserState(browser_state, true)); |
| 37 } | 37 } |
| 38 | 38 |
| 39 // static | 39 // static |
| 40 AccountReconcilorFactory* AccountReconcilorFactory::GetInstance() { | 40 AccountReconcilorFactory* AccountReconcilorFactory::GetInstance() { |
| 41 return base::Singleton<AccountReconcilorFactory>::get(); | 41 return base::Singleton<AccountReconcilorFactory>::get(); |
| 42 } | 42 } |
| 43 | 43 |
| 44 scoped_ptr<KeyedService> AccountReconcilorFactory::BuildServiceInstanceFor( | 44 std::unique_ptr<KeyedService> AccountReconcilorFactory::BuildServiceInstanceFor( |
| 45 web::BrowserState* context) const { | 45 web::BrowserState* context) const { |
| 46 ios::ChromeBrowserState* chrome_browser_state = | 46 ios::ChromeBrowserState* chrome_browser_state = |
| 47 ios::ChromeBrowserState::FromBrowserState(context); | 47 ios::ChromeBrowserState::FromBrowserState(context); |
| 48 scoped_ptr<AccountReconcilor> reconcilor(new AccountReconcilor( | 48 std::unique_ptr<AccountReconcilor> reconcilor(new AccountReconcilor( |
| 49 OAuth2TokenServiceFactory::GetForBrowserState(chrome_browser_state), | 49 OAuth2TokenServiceFactory::GetForBrowserState(chrome_browser_state), |
| 50 SigninManagerFactory::GetForBrowserState(chrome_browser_state), | 50 SigninManagerFactory::GetForBrowserState(chrome_browser_state), |
| 51 SigninClientFactory::GetForBrowserState(chrome_browser_state), | 51 SigninClientFactory::GetForBrowserState(chrome_browser_state), |
| 52 GaiaCookieManagerServiceFactory::GetForBrowserState( | 52 GaiaCookieManagerServiceFactory::GetForBrowserState( |
| 53 chrome_browser_state))); | 53 chrome_browser_state))); |
| 54 reconcilor->Initialize(true /* start_reconcile_if_tokens_available */); | 54 reconcilor->Initialize(true /* start_reconcile_if_tokens_available */); |
| 55 return std::move(reconcilor); | 55 return std::move(reconcilor); |
| 56 } | 56 } |
| 57 | 57 |
| 58 } // namespace ios | 58 } // namespace ios |
| OLD | NEW |