Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(617)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/signin/core/browser/gaia_cookie_manager_service_unittest.cc

Issue 1129463004: Let Ubertoken Fetch be primed with an access token. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ChromeOS sends access token to GCMS Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/chromeos/login/signin/oauth2_login_verifier.cc ('K') | « components/signin/core/browser/gaia_cookie_manager_service.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/signin/core/browser/gaia_cookie_manager_service_unittest.cc
diff --git a/components/signin/core/browser/gaia_cookie_manager_service_unittest.cc b/components/signin/core/browser/gaia_cookie_manager_service_unittest.cc
index 4975e81cdfc0ce390bcfc07a30f09950be606258..ee604ec5e96598a7dfd637476c964285bddfb69a 100644
--- a/components/signin/core/browser/gaia_cookie_manager_service_unittest.cc
+++ b/components/signin/core/browser/gaia_cookie_manager_service_unittest.cc
@@ -60,7 +60,7 @@ class InstrumentedGaiaCookieManagerService : public GaiaCookieManagerService {
virtual ~InstrumentedGaiaCookieManagerService() { total--; }
- MOCK_METHOD0(StartFetchingUbertoken, void());
+ MOCK_METHOD1(StartFetchingUbertoken, void(const std::string&));
MOCK_METHOD0(StartFetchingListAccounts, void());
MOCK_METHOD0(StartFetchingMergeSession, void());
MOCK_METHOD0(StartLogOutUrlFetch, void());
@@ -171,7 +171,7 @@ TEST_F(GaiaCookieManagerServiceTest, Success) {
InstrumentedGaiaCookieManagerService helper(token_service(), signin_client());
MockObserver observer(&helper);
- EXPECT_CALL(helper, StartFetchingUbertoken());
+ EXPECT_CALL(helper, StartFetchingUbertoken(std::string()));
EXPECT_CALL(observer, OnAddAccountToCookieCompleted("acc1@gmail.com",
no_error()));
@@ -183,7 +183,7 @@ TEST_F(GaiaCookieManagerServiceTest, FailedMergeSession) {
InstrumentedGaiaCookieManagerService helper(token_service(), signin_client());
MockObserver observer(&helper);
- EXPECT_CALL(helper, StartFetchingUbertoken());
+ EXPECT_CALL(helper, StartFetchingUbertoken(std::string()));
EXPECT_CALL(observer, OnAddAccountToCookieCompleted("acc1@gmail.com",
error()));
@@ -208,7 +208,7 @@ TEST_F(GaiaCookieManagerServiceTest, MergeSessionRetried) {
InstrumentedGaiaCookieManagerService helper(token_service(), signin_client());
MockObserver observer(&helper);
- EXPECT_CALL(helper, StartFetchingUbertoken());
+ EXPECT_CALL(helper, StartFetchingUbertoken(std::string()));
EXPECT_CALL(helper, StartFetchingMergeSession());
EXPECT_CALL(observer, OnAddAccountToCookieCompleted("acc1@gmail.com",
no_error()));
@@ -230,7 +230,7 @@ TEST_F(GaiaCookieManagerServiceTest, MergeSessionRetriedTwice) {
InstrumentedGaiaCookieManagerService helper(token_service(), signin_client());
MockObserver observer(&helper);
- EXPECT_CALL(helper, StartFetchingUbertoken());
+ EXPECT_CALL(helper, StartFetchingUbertoken(std::string()));
EXPECT_CALL(helper, StartFetchingMergeSession()).Times(2);
EXPECT_CALL(observer, OnAddAccountToCookieCompleted("acc1@gmail.com",
no_error()));
@@ -260,7 +260,7 @@ TEST_F(GaiaCookieManagerServiceTest, FailedUbertoken) {
InstrumentedGaiaCookieManagerService helper(token_service(), signin_client());
MockObserver observer(&helper);
- EXPECT_CALL(helper, StartFetchingUbertoken());
+ EXPECT_CALL(helper, StartFetchingUbertoken(std::string()));
EXPECT_CALL(observer, OnAddAccountToCookieCompleted("acc1@gmail.com",
error()));
@@ -272,7 +272,7 @@ TEST_F(GaiaCookieManagerServiceTest, ContinueAfterSuccess) {
InstrumentedGaiaCookieManagerService helper(token_service(), signin_client());
MockObserver observer(&helper);
- EXPECT_CALL(helper, StartFetchingUbertoken()).Times(2);
+ EXPECT_CALL(helper, StartFetchingUbertoken(std::string())).Times(2);
EXPECT_CALL(observer, OnAddAccountToCookieCompleted("acc1@gmail.com",
no_error()));
EXPECT_CALL(observer, OnAddAccountToCookieCompleted("acc2@gmail.com",
@@ -288,7 +288,7 @@ TEST_F(GaiaCookieManagerServiceTest, ContinueAfterFailure1) {
InstrumentedGaiaCookieManagerService helper(token_service(), signin_client());
MockObserver observer(&helper);
- EXPECT_CALL(helper, StartFetchingUbertoken()).Times(2);
+ EXPECT_CALL(helper, StartFetchingUbertoken(std::string())).Times(2);
EXPECT_CALL(observer, OnAddAccountToCookieCompleted("acc1@gmail.com",
error()));
EXPECT_CALL(observer, OnAddAccountToCookieCompleted("acc2@gmail.com",
@@ -304,7 +304,7 @@ TEST_F(GaiaCookieManagerServiceTest, ContinueAfterFailure2) {
InstrumentedGaiaCookieManagerService helper(token_service(), signin_client());
MockObserver observer(&helper);
- EXPECT_CALL(helper, StartFetchingUbertoken()).Times(2);
+ EXPECT_CALL(helper, StartFetchingUbertoken(std::string())).Times(2);
EXPECT_CALL(observer, OnAddAccountToCookieCompleted("acc1@gmail.com",
error()));
EXPECT_CALL(observer, OnAddAccountToCookieCompleted("acc2@gmail.com",
@@ -320,7 +320,7 @@ TEST_F(GaiaCookieManagerServiceTest, AllRequestsInMultipleGoes) {
InstrumentedGaiaCookieManagerService helper(token_service(), signin_client());
MockObserver observer(&helper);
- EXPECT_CALL(helper, StartFetchingUbertoken()).Times(4);
+ EXPECT_CALL(helper, StartFetchingUbertoken(std::string())).Times(4);
EXPECT_CALL(observer, OnAddAccountToCookieCompleted(_, no_error())).Times(4);
helper.AddAccountToCookie("acc1@gmail.com");
@@ -342,7 +342,7 @@ TEST_F(GaiaCookieManagerServiceTest, LogOutAllAccountsNoQueue) {
InstrumentedGaiaCookieManagerService helper(token_service(), signin_client());
MockObserver observer(&helper);
- EXPECT_CALL(helper, StartFetchingUbertoken());
+ EXPECT_CALL(helper, StartFetchingUbertoken(std::string()));
EXPECT_CALL(observer, OnAddAccountToCookieCompleted("acc2@gmail.com",
no_error()));
EXPECT_CALL(helper, StartLogOutUrlFetch());
@@ -359,7 +359,7 @@ TEST_F(GaiaCookieManagerServiceTest, LogOutAllAccountsFails) {
InstrumentedGaiaCookieManagerService helper(token_service(), signin_client());
MockObserver observer(&helper);
- EXPECT_CALL(helper, StartFetchingUbertoken());
+ EXPECT_CALL(helper, StartFetchingUbertoken(std::string()));
EXPECT_CALL(observer, OnAddAccountToCookieCompleted("acc2@gmail.com",
no_error()));
EXPECT_CALL(helper, StartLogOutUrlFetch());
@@ -377,7 +377,7 @@ TEST_F(GaiaCookieManagerServiceTest, LogOutAllAccountsAfterOneAddInQueue) {
InstrumentedGaiaCookieManagerService helper(token_service(), signin_client());
MockObserver observer(&helper);
- EXPECT_CALL(helper, StartFetchingUbertoken());
+ EXPECT_CALL(helper, StartFetchingUbertoken(std::string()));
EXPECT_CALL(observer, OnAddAccountToCookieCompleted("acc2@gmail.com",
no_error()));
EXPECT_CALL(helper, StartLogOutUrlFetch());
@@ -393,7 +393,7 @@ TEST_F(GaiaCookieManagerServiceTest, LogOutAllAccountsAfterTwoAddsInQueue) {
InstrumentedGaiaCookieManagerService helper(token_service(), signin_client());
MockObserver observer(&helper);
- EXPECT_CALL(helper, StartFetchingUbertoken());
+ EXPECT_CALL(helper, StartFetchingUbertoken(std::string()));
EXPECT_CALL(observer, OnAddAccountToCookieCompleted("acc1@gmail.com",
no_error()));
EXPECT_CALL(observer, OnAddAccountToCookieCompleted("acc2@gmail.com",
@@ -413,7 +413,7 @@ TEST_F(GaiaCookieManagerServiceTest, LogOutAllAccountsTwice) {
InstrumentedGaiaCookieManagerService helper(token_service(), signin_client());
MockObserver observer(&helper);
- EXPECT_CALL(helper, StartFetchingUbertoken());
+ EXPECT_CALL(helper, StartFetchingUbertoken(std::string()));
EXPECT_CALL(observer, OnAddAccountToCookieCompleted("acc2@gmail.com",
no_error()));
EXPECT_CALL(helper, StartLogOutUrlFetch());
@@ -431,7 +431,7 @@ TEST_F(GaiaCookieManagerServiceTest, LogOutAllAccountsBeforeAdd) {
InstrumentedGaiaCookieManagerService helper(token_service(), signin_client());
MockObserver observer(&helper);
- EXPECT_CALL(helper, StartFetchingUbertoken()).Times(2);
+ EXPECT_CALL(helper, StartFetchingUbertoken(std::string())).Times(2);
EXPECT_CALL(observer, OnAddAccountToCookieCompleted("acc2@gmail.com",
no_error()));
EXPECT_CALL(helper, StartLogOutUrlFetch());
@@ -453,7 +453,7 @@ TEST_F(GaiaCookieManagerServiceTest, LogOutAllAccountsBeforeLogoutAndAdd) {
MockObserver observer(&helper);
- EXPECT_CALL(helper, StartFetchingUbertoken()).Times(2);
+ EXPECT_CALL(helper, StartFetchingUbertoken(std::string())).Times(2);
EXPECT_CALL(observer, OnAddAccountToCookieCompleted("acc2@gmail.com",
no_error()));
EXPECT_CALL(helper, StartLogOutUrlFetch());
@@ -487,7 +487,7 @@ TEST_F(GaiaCookieManagerServiceTest, PendingSigninThenSignout) {
no_error()));
// Total sign in 2 times, not enforcing ordered sequences.
- EXPECT_CALL(helper, StartFetchingUbertoken()).Times(2);
+ EXPECT_CALL(helper, StartFetchingUbertoken(std::string())).Times(2);
helper.AddAccountToCookie("acc1@gmail.com");
helper.LogOutAllAccounts();
@@ -503,7 +503,7 @@ TEST_F(GaiaCookieManagerServiceTest, CancelSignIn) {
InstrumentedGaiaCookieManagerService helper(token_service(), signin_client());
MockObserver observer(&helper);
- EXPECT_CALL(helper, StartFetchingUbertoken());
+ EXPECT_CALL(helper, StartFetchingUbertoken(std::string()));
EXPECT_CALL(observer, OnAddAccountToCookieCompleted("acc2@gmail.com",
canceled()));
EXPECT_CALL(observer, OnAddAccountToCookieCompleted("acc1@gmail.com",
@@ -639,7 +639,7 @@ TEST_F(GaiaCookieManagerServiceTest, ExternalCcResultFetcherTruncate) {
TEST_F(GaiaCookieManagerServiceTest, UbertokenSuccessFetchesExternalCC) {
InstrumentedGaiaCookieManagerService helper(token_service(), signin_client());
- EXPECT_CALL(helper, StartFetchingUbertoken());
+ EXPECT_CALL(helper, StartFetchingUbertoken(std::string()));
helper.AddAccountToCookie("acc1@gmail.com");
ASSERT_FALSE(factory()->GetFetcherByID(0));
@@ -664,7 +664,7 @@ TEST_F(GaiaCookieManagerServiceTest, UbertokenSuccessFetchesExternalCCOnce) {
helper.external_cc_result_fetcher_for_testing()->Start();
- EXPECT_CALL(helper, StartFetchingUbertoken());
+ EXPECT_CALL(helper, StartFetchingUbertoken(std::string()));
helper.AddAccountToCookie("acc2@gmail.com");
// There is already a ExternalCCResultFetch underway. This will trigger
// StartFetchingMergeSession.
« chrome/browser/chromeos/login/signin/oauth2_login_verifier.cc ('K') | « components/signin/core/browser/gaia_cookie_manager_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698