chrome/browser/chromeos/login/existing_user_controller_browsertest.cc - Issue 2771803003: Don't start FRE from the login 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/chromeos/login/existing_user_controller_browsertest.cc

Issue 2771803003: Don't start FRE from the login screen (Closed)

Patch Set: Fix browser tests Created 3 years, 8 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/enrollment/auto_enrollment_controller.cc ('K') | « chrome/browser/chromeos/login/existing_user_controller.cc ('k') | chrome/browser/chromeos/login/ui/login_display_host.h » ('j') | chrome/browser/chromeos/policy/auto_enrollment_client.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

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

index 9566108f335e2168c4539d03ed31b47dfdbb643b..83a6aeadc85213cfff02a5757ce0322ca5c94a58 100644

--- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

+++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

@@ -668,8 +668,6 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,

user_context.SetKey(Key(kPassword));

user_context.SetUserIDHash(user_context.GetAccountId().GetUserEmail());

ExpectSuccessfulLogin(user_context);

- EXPECT_CALL(*mock_login_display_host_, OnCompleteLogin())

- .Times(1);

existing_user_controller()->OnSigninScreenReady();

SetAutoLoginPolicy(kPublicSessionUserEmail, kAutoLoginLongDelay);

@@ -796,7 +794,6 @@ class ExistingUserControllerActiveDirectoryTest

void ExpectLoginSuccess() {

EXPECT_CALL(*mock_login_display_, SetUIEnabled(false)).Times(2);

EXPECT_CALL(*mock_login_display_, SetUIEnabled(true)).Times(1);

- EXPECT_CALL(*mock_login_display_host_, OnCompleteLogin()).Times(1);

}

};

@@ -837,7 +834,6 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerActiveDirectoryTest,

IN_PROC_BROWSER_TEST_F(ExistingUserControllerActiveDirectoryTest,

GAIAAccountLogin_Failure) {

ExpectLoginFailure();

- EXPECT_CALL(*mock_login_display_host_, OnCompleteLogin()).Times(1);

UserContext user_context(gaia_account_id_);

user_context.SetKey(Key(kPassword));

user_context.SetUserIDHash(gaia_account_id_.GetUserEmail());