chrome/browser/chromeos/login/supervised/supervised_user_test_base.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/supervised/supervised_user_test_base.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: Fix Win GN build. Created 5 years, 1 month 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

« no previous file with comments | « chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc ('k') | chrome/browser/chromeos/login/user_flow.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc

diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc b/chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc

index 39fca9f09bb845f207ad9947f91a18376a38eff7..ab41788e199e0db697d91c9d349f68b9e9899290 100644

--- a/chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc

+++ b/chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc

@@ -294,7 +294,7 @@ void SupervisedUserTestBase::StartFlowLoginAsManager() {

// Next button is now enabled.

JSExpect("!$('supervised-user-creation-next-button').disabled");

- UserContext user_context(kTestManager);

+ UserContext user_context(AccountId::FromUserEmail(kTestManager));

user_context.SetGaiaID(GetGaiaIDForUserID(kTestManager));

user_context.SetKey(Key(kTestManagerPassword));

SetExpectedCredentials(user_context);

@@ -308,7 +308,8 @@ void SupervisedUserTestBase::StartFlowLoginAsManager() {

// OAuth token is valid.

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

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

+ AccountId::FromUserEmail(kTestManager),

+ user_manager::User::OAUTH2_TOKEN_STATUS_VALID);

base::RunLoop().RunUntilIdle();

// Check the page have changed.