components/signin/core/browser/account_reconcilor.h - Issue 1267843003: Fix reconcilor loop when the primary account is in an auth error state.

Side by Side Diff: components/signin/core/browser/account_reconcilor.h

Issue 1267843003: Fix reconcilor loop when the primary account is in an auth error state. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix typo Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

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 76 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
87 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest,	87 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest,

88 StartReconcileRemoveFromCookie);	88 StartReconcileRemoveFromCookie);

89 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest,	89 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest,

90 StartReconcileAddToCookieTwice);	90 StartReconcileAddToCookieTwice);

91 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, StartReconcileBadPrimary);	91 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, StartReconcileBadPrimary);

92 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, StartReconcileOnlyOnce);	92 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, StartReconcileOnlyOnce);

93 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest,	93 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest,

94 StartReconcileWithSessionInfoExpiredDefault);	94 StartReconcileWithSessionInfoExpiredDefault);

95 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest,	95 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest,

96 AddAccountToCookieCompletedWithBogusAccount);	96 AddAccountToCookieCompletedWithBogusAccount);

	97 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, NoLoopWithBadPrimary);

	98 FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, WontMergeAccountsWithError);

97	99

98 // Register and unregister with dependent services.	100 // Register and unregister with dependent services.

99 void RegisterWithSigninManager();	101 void RegisterWithSigninManager();

100 void UnregisterWithSigninManager();	102 void UnregisterWithSigninManager();

101 void RegisterWithTokenService();	103 void RegisterWithTokenService();

102 void UnregisterWithTokenService();	104 void UnregisterWithTokenService();

103 void RegisterWithCookieManagerService();	105 void RegisterWithCookieManagerService();

104 void UnregisterWithCookieManagerService();	106 void UnregisterWithCookieManagerService();

105 void RegisterWithContentSettings();	107 void RegisterWithContentSettings();

106 void UnregisterWithContentSettings();	108 void UnregisterWithContentSettings();

(...skipping 79 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
186 // These members are used to validate the tokens in OAuth2TokenService.	188 // These members are used to validate the tokens in OAuth2TokenService.

187 std::string primary_account_;	189 std::string primary_account_;

188 std::vector<std::string> chrome_accounts_;	190 std::vector<std::string> chrome_accounts_;

189 std::vector<std::string> add_to_cookie_;	191 std::vector<std::string> add_to_cookie_;

190 bool chrome_accounts_changed_;	192 bool chrome_accounts_changed_;

191	193

192 DISALLOW_COPY_AND_ASSIGN(AccountReconcilor);	194 DISALLOW_COPY_AND_ASSIGN(AccountReconcilor);

193 };	195 };

194	196

195 #endif // COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_	197 #endif // COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_

OLD	NEW