chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc - Issue 1425093004: Revert of 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/ui/webui/chromeos/login/signin_userlist_unittest.cc

Issue 1425093004: Revert of 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: 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

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

Index: chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc b/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc

index 952afcd483586a6d64e5af57f5e8ad46f2e06e39..ed1d6f39f4627d511a416a400afaa12ec22507d4 100644

--- a/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc

+++ b/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc

@@ -49,13 +49,12 @@

fake_user_manager_->set_multi_profile_user_controller(controller_.get());

for (size_t i = 0; i < arraysize(kUsersPublic); ++i)

- fake_user_manager_->AddPublicAccountUser(

- AccountId::FromUserEmail(kUsersPublic[i]));

+ fake_user_manager_->AddPublicAccountUser(kUsersPublic[i]);

for (size_t i = 0; i < arraysize(kUsers); ++i)

- fake_user_manager_->AddUser(AccountId::FromUserEmail(kUsers[i]));

+ fake_user_manager_->AddUser(kUsers[i]);

- fake_user_manager_->set_owner_id(AccountId::FromUserEmail(kOwner));

+ fake_user_manager_->set_owner_email(kOwner);

}

void TearDown() override {

@@ -85,10 +84,8 @@

EXPECT_EQ(kMaxUsers, users_to_send.size());

EXPECT_EQ(kOwner, users_to_send.back()->email());

- fake_user_manager_->RemoveUserFromList(

- AccountId::FromUserEmail("a16@gmail.com"));

- fake_user_manager_->RemoveUserFromList(

- AccountId::FromUserEmail("a17@gmail.com"));

+ fake_user_manager_->RemoveUserFromList("a16@gmail.com");

+ fake_user_manager_->RemoveUserFromList("a17@gmail.com");

users_to_send = UserSelectionScreen::PrepareUserListForSending(

fake_user_manager_->GetUsers(),

kOwner,