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> |
| 8 |
7 #include "base/memory/singleton.h" | 9 #include "base/memory/singleton.h" |
8 #include "components/keyed_service/ios/browser_state_dependency_manager.h" | 10 #include "components/keyed_service/ios/browser_state_dependency_manager.h" |
9 #include "components/signin/core/browser/account_reconcilor.h" | 11 #include "components/signin/core/browser/account_reconcilor.h" |
10 #include "ios/chrome/browser/signin/gaia_cookie_manager_service_factory.h" | 12 #include "ios/chrome/browser/signin/gaia_cookie_manager_service_factory.h" |
11 #include "ios/chrome/browser/signin/oauth2_token_service_factory.h" | 13 #include "ios/chrome/browser/signin/oauth2_token_service_factory.h" |
12 #include "ios/chrome/browser/signin/signin_client_factory.h" | 14 #include "ios/chrome/browser/signin/signin_client_factory.h" |
13 #include "ios/chrome/browser/signin/signin_manager_factory.h" | 15 #include "ios/chrome/browser/signin/signin_manager_factory.h" |
14 #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.
h" | 16 #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.
h" |
15 | 17 |
16 namespace ios { | 18 namespace ios { |
(...skipping 26 matching lines...) Expand all Loading... |
43 web::BrowserState* context) const { | 45 web::BrowserState* context) const { |
44 ios::ChromeBrowserState* chrome_browser_state = | 46 ios::ChromeBrowserState* chrome_browser_state = |
45 ios::ChromeBrowserState::FromBrowserState(context); | 47 ios::ChromeBrowserState::FromBrowserState(context); |
46 scoped_ptr<AccountReconcilor> reconcilor(new AccountReconcilor( | 48 scoped_ptr<AccountReconcilor> reconcilor(new AccountReconcilor( |
47 OAuth2TokenServiceFactory::GetForBrowserState(chrome_browser_state), | 49 OAuth2TokenServiceFactory::GetForBrowserState(chrome_browser_state), |
48 SigninManagerFactory::GetForBrowserState(chrome_browser_state), | 50 SigninManagerFactory::GetForBrowserState(chrome_browser_state), |
49 SigninClientFactory::GetForBrowserState(chrome_browser_state), | 51 SigninClientFactory::GetForBrowserState(chrome_browser_state), |
50 GaiaCookieManagerServiceFactory::GetForBrowserState( | 52 GaiaCookieManagerServiceFactory::GetForBrowserState( |
51 chrome_browser_state))); | 53 chrome_browser_state))); |
52 reconcilor->Initialize(true /* start_reconcile_if_tokens_available */); | 54 reconcilor->Initialize(true /* start_reconcile_if_tokens_available */); |
53 return reconcilor.Pass(); | 55 return std::move(reconcilor); |
54 } | 56 } |
55 | 57 |
56 } // namespace ios | 58 } // namespace ios |
OLD | NEW |