chrome/browser/chromeos/login/saml/saml_browsertest.cc - Issue 1412813003: This CL replaces user_manager::UserID with AccountId.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/saml/saml_browsertest.cc

Issue 1412813003: This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names

Patch Set: Fixed tests. Created 5 years, 2 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

« ash/test/test_session_state_delegate.cc ('K') | « chrome/browser/chromeos/login/reauth_stats.cc ('k') | chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/saml/saml_browsertest.cc

diff --git a/chrome/browser/chromeos/login/saml/saml_browsertest.cc b/chrome/browser/chromeos/login/saml/saml_browsertest.cc

index f1349d5608786db0c8ef90ef7a83fd1b4a961a18..6c883651b5516bb81213e888009eee2cdcfaa15b 100644

--- a/chrome/browser/chromeos/login/saml/saml_browsertest.cc

+++ b/chrome/browser/chromeos/login/saml/saml_browsertest.cc

@@ -968,11 +968,13 @@ void SAMLPolicyTest::SetUpOnMainThread() {

// Pretend that the test users' OAuth tokens are valid.

user_manager::UserManager::Get()->SaveUserOAuthStatus(

- kFirstSAMLUserEmail, user_manager::User::OAUTH2_TOKEN_STATUS_VALID);

+ AccountId::FromUserEmail(kFirstSAMLUserEmail),

+ user_manager::User::OAUTH2_TOKEN_STATUS_VALID);

user_manager::UserManager::Get()->SaveUserOAuthStatus(

- kNonSAMLUserEmail, user_manager::User::OAUTH2_TOKEN_STATUS_VALID);

+ AccountId::FromUserEmail(kNonSAMLUserEmail),

+ user_manager::User::OAUTH2_TOKEN_STATUS_VALID);

user_manager::UserManager::Get()->SaveUserOAuthStatus(

- kDifferentDomainSAMLUserEmail,

+ AccountId::FromUserEmail(kDifferentDomainSAMLUserEmail),

user_manager::User::OAUTH2_TOKEN_STATUS_VALID);

// Set up fake networks.