chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc - Issue 1454153002: Revert of This CL replaces e-mail with AccountId on user selection screen.

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 1454153002: Revert of This CL replaces e-mail with AccountId on user selection screen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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/ui/webui/chromeos/login/signin_screen_handler.cc ('k') | chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.h » ('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 aa8f2ecbbd34ded8daccca7a7dd8783bbb711c80..0a69c1f4ed7195a701e78218073c2b6a7ec1266c 100644

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

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

@@ -13,7 +13,6 @@

#include "chrome/test/base/testing_browser_process.h"

#include "chrome/test/base/testing_profile_manager.h"

#include "components/proximity_auth/screenlock_bridge.h"

-#include "components/signin/core/account_id/account_id.h"

#include "components/user_manager/user.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -87,8 +86,7 @@

EXPECT_LT(kMaxUsers, fake_user_manager_->GetUsers().size());

user_manager::UserList users_to_send =

UserSelectionScreen::PrepareUserListForSending(

- fake_user_manager_->GetUsers(), AccountId::FromUserEmail(kOwner),

- true /* is signin to add */);

+ fake_user_manager_->GetUsers(), kOwner, true /* is signin to add */);

EXPECT_EQ(kMaxUsers, users_to_send.size());

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

@@ -98,7 +96,8 @@

fake_user_manager_->RemoveUserFromList(

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

users_to_send = UserSelectionScreen::PrepareUserListForSending(

- fake_user_manager_->GetUsers(), AccountId::FromUserEmail(kOwner),

+ fake_user_manager_->GetUsers(),

+ kOwner,

true /* is signin to add */);

EXPECT_EQ(kMaxUsers, users_to_send.size());

@@ -109,14 +108,14 @@

TEST_F(SigninPrepareUserListTest, PublicAccounts) {

user_manager::UserList users_to_send =

UserSelectionScreen::PrepareUserListForSending(

- fake_user_manager_->GetUsers(), AccountId::FromUserEmail(kOwner),

- true /* is signin to add */);

+ fake_user_manager_->GetUsers(), kOwner, true /* is signin to add */);

EXPECT_EQ(kMaxUsers, users_to_send.size());

EXPECT_EQ("a0@gmail.com", users_to_send.front()->email());

users_to_send = UserSelectionScreen::PrepareUserListForSending(

- fake_user_manager_->GetUsers(), AccountId::FromUserEmail(kOwner),

+ fake_user_manager_->GetUsers(),

+ kOwner,

false /* is signin to add */);

EXPECT_EQ(kMaxUsers, users_to_send.size());