| 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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 } | 102 } |
| 103 | 103 |
| 104 const EmailSet& GetValidChromeAccountsForTesting() const { | 104 const EmailSet& GetValidChromeAccountsForTesting() const { |
| 105 return valid_chrome_accounts_; | 105 return valid_chrome_accounts_; |
| 106 } | 106 } |
| 107 | 107 |
| 108 const EmailSet& GetInvalidChromeAccountsForTesting() const { | 108 const EmailSet& GetInvalidChromeAccountsForTesting() const { |
| 109 return invalid_chrome_accounts_; | 109 return invalid_chrome_accounts_; |
| 110 } | 110 } |
| 111 | 111 |
| 112 // Virtual so that it can be overridden in tests. |
| 113 virtual void StartFetchingExternalCcResult(); |
| 112 | 114 |
| 113 friend class AccountReconcilorTest; | 115 friend class AccountReconcilorTest; |
| 114 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, SigninManagerRegistration); | 116 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, SigninManagerRegistration); |
| 115 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, Reauth); | 117 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, Reauth); |
| 116 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, ProfileAlreadyConnected); | 118 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, ProfileAlreadyConnected); |
| 117 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, GetAccountsFromCookieSuccess); | 119 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, GetAccountsFromCookieSuccess); |
| 118 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, GetAccountsFromCookieFailure); | 120 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, GetAccountsFromCookieFailure); |
| 119 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, ValidateAccountsFromTokens); | 121 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, ValidateAccountsFromTokens); |
| 120 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, | 122 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, |
| 121 ValidateAccountsFromTokensFailedUserInfo); | 123 ValidateAccountsFromTokensFailedUserInfo); |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 256 EmailSet invalid_chrome_accounts_; | 258 EmailSet invalid_chrome_accounts_; |
| 257 std::vector<std::string> add_to_cookie_; | 259 std::vector<std::string> add_to_cookie_; |
| 258 std::vector<std::pair<std::string, int> > add_to_chrome_; | 260 std::vector<std::pair<std::string, int> > add_to_chrome_; |
| 259 | 261 |
| 260 std::deque<GetAccountsFromCookieCallback> get_gaia_accounts_callbacks_; | 262 std::deque<GetAccountsFromCookieCallback> get_gaia_accounts_callbacks_; |
| 261 | 263 |
| 262 DISALLOW_COPY_AND_ASSIGN(AccountReconcilor); | 264 DISALLOW_COPY_AND_ASSIGN(AccountReconcilor); |
| 263 }; | 265 }; |
| 264 | 266 |
| 265 #endif // COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_ | 267 #endif // COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_ |
| OLD | NEW |