chrome/browser/chromeos/login/existing_user_controller_browsertest.cc - Issue 293613003: ChromeOS login webui refactoring: split user selection/gaia login screens.

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 293613003: ChromeOS login webui refactoring: split user selection/gaia login screens. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Yet another merge Created 6 years, 7 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/chromeos/login/existing_user_controller.cc ('k') | chrome/browser/chromeos/login/screens/core_oobe_actor.h » ('j') | no next file with comments »
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 b0ff5b8da4e434f03cdcf71f2e51f259e1b3b9a8..251d4084d90ad0610e08247713d1e12c717ed8ce 100644

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

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

@@ -250,12 +250,8 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, ExistingUserLogin) {

DoBrowserLaunch(testing_profile_.get(),

mock_login_display_host_.get()))

.Times(1);

- EXPECT_CALL(*mock_login_display_, OnLoginSuccess(kUsername))

- .Times(1);

EXPECT_CALL(*mock_login_display_, SetUIEnabled(true))

.Times(1);

- EXPECT_CALL(*mock_login_display_, OnFadeOut())

- .Times(1);

EXPECT_CALL(*mock_login_display_host_,

StartWizardPtr(WizardController::kTermsOfServiceScreenName, NULL))

.Times(0);

@@ -271,8 +267,6 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, AutoEnrollAfterSignIn) {

StartWizardPtr(WizardController::kEnrollmentScreenName,

_))

.Times(1);

- EXPECT_CALL(*mock_login_display_, OnFadeOut())

- .Times(1);

EXPECT_CALL(*mock_login_display_host_.get(), OnCompleteLogin())

.Times(1);

EXPECT_CALL(*mock_user_manager_, IsCurrentUserNew())

@@ -321,10 +315,6 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest,

&base::Callback<void(void)>::Run),

InvokeWithoutArgs(&profile_prepared_cb_,

&base::Callback<void(void)>::Run)));

- EXPECT_CALL(*mock_login_display_, OnLoginSuccess(kNewUsername))

- .Times(1);

- EXPECT_CALL(*mock_login_display_, OnFadeOut())

- .Times(1);

EXPECT_CALL(*mock_login_display_host_.get(), OnCompleteLogin())

.Times(1);

EXPECT_CALL(*mock_user_manager_, IsCurrentUserNew())

@@ -454,12 +444,8 @@ class ExistingUserControllerPublicSessionTest

DoBrowserLaunch(testing_profile_.get(),

mock_login_display_host_.get()))

.Times(1);

- EXPECT_CALL(*mock_login_display_, OnLoginSuccess(username))

- .Times(1);

EXPECT_CALL(*mock_login_display_, SetUIEnabled(true))

.Times(1);

- EXPECT_CALL(*mock_login_display_, OnFadeOut())

- .Times(1);

EXPECT_CALL(*mock_login_display_host_,

StartWizardPtr(WizardController::kTermsOfServiceScreenName,

NULL))