chrome/browser/signin/cross_device_promo_unittest.cc - Issue 1162103003: ListAccounts will return the Gaia ID as well as the email of the account.

Unified Diff: chrome/browser/signin/cross_device_promo_unittest.cc

Issue 1162103003: ListAccounts will return the Gaia ID as well as the email of the account. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: show raw email in signin internals Created 5 years, 6 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_manager.cc ('K') | « chrome/browser/signin/cross_device_promo.cc ('k') | chrome/browser/signin/fake_gaia_cookie_manager_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/signin/cross_device_promo_unittest.cc

diff --git a/chrome/browser/signin/cross_device_promo_unittest.cc b/chrome/browser/signin/cross_device_promo_unittest.cc

index 604a67424a6ec23ac7b2bb26e41a414bcc13701b..9f224022db81d9bf4ddd0db5753187b0d39c222e 100644

--- a/chrome/browser/signin/cross_device_promo_unittest.cc

+++ b/chrome/browser/signin/cross_device_promo_unittest.cc

@@ -286,7 +286,7 @@ TEST_F(CrossDevicePromoTest, TrackAccountsInCookie) {

ASSERT_FALSE(prefs()->HasPrefPath(

prefs::kCrossDevicePromoObservedSingleAccountCookie));

- std::vector<std::pair<std::string, bool>> accounts;

+ std::vector<gaia::ListedAccount> accounts;

// Setting a single cookie sets the time.

base::Time before_setting_cookies = base::Time::Now();

@@ -356,7 +356,7 @@ TEST_F(CrossDevicePromoTest, SingleAccountEligibility) {

// Notice a single account.

{

base::HistogramTester test_single_account;

- std::vector<std::pair<std::string, bool>> accounts;

+ std::vector<gaia::ListedAccount> accounts;

cookie_manager_service()->set_list_accounts_fetched_once_for_testing(false);

cookie_manager_service()->SetListAccountsResponseOneAccount("foo@bar.com");

EXPECT_FALSE(cookie_manager_service()->ListAccounts(&accounts));

@@ -386,7 +386,7 @@ TEST_F(CrossDevicePromoTest, NumDevicesEligibility) {

EXPECT_FALSE(promo()->CheckPromoEligibilityForTesting());

cookie_manager_service()->set_list_accounts_fetched_once_for_testing(false);

cookie_manager_service()->SetListAccountsResponseOneAccount("foo@bar.com");

- std::vector<std::pair<std::string, bool>> accounts;

+ std::vector<gaia::ListedAccount> accounts;

EXPECT_FALSE(cookie_manager_service()->ListAccounts(&accounts));

base::RunLoop().RunUntilIdle();

@@ -456,7 +456,7 @@ TEST_F(CrossDevicePromoTest, ThrottleDeviceActivityCall) {

EXPECT_FALSE(promo()->CheckPromoEligibilityForTesting());

cookie_manager_service()->set_list_accounts_fetched_once_for_testing(false);

cookie_manager_service()->SetListAccountsResponseOneAccount("foo@bar.com");

- std::vector<std::pair<std::string, bool>> accounts;

+ std::vector<gaia::ListedAccount> accounts;

EXPECT_FALSE(cookie_manager_service()->ListAccounts(&accounts));

base::RunLoop().RunUntilIdle();

@@ -478,7 +478,7 @@ TEST_F(CrossDevicePromoTest, NumDevicesKnown) {

EXPECT_FALSE(promo()->CheckPromoEligibilityForTesting());

cookie_manager_service()->set_list_accounts_fetched_once_for_testing(false);

cookie_manager_service()->SetListAccountsResponseOneAccount("foo@bar.com");

- std::vector<std::pair<std::string, bool>> accounts;

+ std::vector<gaia::ListedAccount> accounts;

EXPECT_FALSE(cookie_manager_service()->ListAccounts(&accounts));

base::RunLoop().RunUntilIdle();

prefs()->SetInt64(prefs::kCrossDevicePromoNextFetchListDevicesTime,

@@ -506,7 +506,7 @@ TEST_F(CrossDevicePromoTest, FetchDeviceResults) {

EXPECT_FALSE(promo()->CheckPromoEligibilityForTesting());

cookie_manager_service()->set_list_accounts_fetched_once_for_testing(false);

cookie_manager_service()->SetListAccountsResponseOneAccount("foo@bar.com");

- std::vector<std::pair<std::string, bool>> accounts;

+ std::vector<gaia::ListedAccount> accounts;

EXPECT_FALSE(cookie_manager_service()->ListAccounts(&accounts));

base::RunLoop().RunUntilIdle();

prefs()->SetInt64(prefs::kCrossDevicePromoNextFetchListDevicesTime,