| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_ | 4 #ifndef COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_ |
| 5 #define COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_ | 5 #define COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_ |
| 6 | 6 |
| 7 #include <deque> | 7 #include <deque> |
| 8 #include <functional> | 8 #include <functional> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 } | 103 } |
| 104 | 104 |
| 105 const EmailSet& GetValidChromeAccountsForTesting() const { | 105 const EmailSet& GetValidChromeAccountsForTesting() const { |
| 106 return valid_chrome_accounts_; | 106 return valid_chrome_accounts_; |
| 107 } | 107 } |
| 108 | 108 |
| 109 const EmailSet& GetInvalidChromeAccountsForTesting() const { | 109 const EmailSet& GetInvalidChromeAccountsForTesting() const { |
| 110 return invalid_chrome_accounts_; | 110 return invalid_chrome_accounts_; |
| 111 } | 111 } |
| 112 | 112 |
| 113 // Virtual so that it can be overridden in tests. |
| 114 virtual void StartFetchingExternalCcResult(); |
| 113 | 115 |
| 114 friend class AccountReconcilorTest; | 116 friend class AccountReconcilorTest; |
| 115 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, SigninManagerRegistration); | 117 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, SigninManagerRegistration); |
| 116 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, Reauth); | 118 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, Reauth); |
| 117 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, ProfileAlreadyConnected); | 119 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, ProfileAlreadyConnected); |
| 118 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, GetAccountsFromCookieSuccess); | 120 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, GetAccountsFromCookieSuccess); |
| 119 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, GetAccountsFromCookieFailure); | 121 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, GetAccountsFromCookieFailure); |
| 120 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, ValidateAccountsFromTokens); | 122 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, ValidateAccountsFromTokens); |
| 121 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, | 123 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, |
| 122 ValidateAccountsFromTokensFailedUserInfo); | 124 ValidateAccountsFromTokensFailedUserInfo); |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 | 262 |
| 261 std::deque<GetAccountsFromCookieCallback> get_gaia_accounts_callbacks_; | 263 std::deque<GetAccountsFromCookieCallback> get_gaia_accounts_callbacks_; |
| 262 | 264 |
| 263 scoped_ptr<SigninClient::CookieChangedCallbackList::Subscription> | 265 scoped_ptr<SigninClient::CookieChangedCallbackList::Subscription> |
| 264 cookie_changed_subscription_; | 266 cookie_changed_subscription_; |
| 265 | 267 |
| 266 DISALLOW_COPY_AND_ASSIGN(AccountReconcilor); | 268 DISALLOW_COPY_AND_ASSIGN(AccountReconcilor); |
| 267 }; | 269 }; |
| 268 | 270 |
| 269 #endif // COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_ | 271 #endif // COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_ |
| OLD | NEW |