chrome/browser/chromeos/login/wizard_controller_browsertest.cc - Issue 12704002: Support for auth code based authentication flow for both app and web UI driven flow.

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/wizard_controller_browsertest.cc

Issue 12704002: Support for auth code based authentication flow for both app and web UI driven flow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase4 Created 7 years, 9 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/webui_screen_locker.cc ('k') | chrome/browser/resources/chromeos/login/screen_gaia_signin.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index bc35174a14b7b1d5aff3c53efcf6fa1f4d2169ea..c8ffd462c14dad7f33224e40465f15a66c8e6b6c 100644

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

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

@@ -293,8 +293,8 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest,

&mock_consumer);

// This calls StartWizard, destroying the current controller() and its mocks;

// don't set expectations on those objects.

- ExistingUserController::current_controller()->CompleteLogin(kUsername,

- kPassword);

+ ExistingUserController::current_controller()->CompleteLogin(

+ UserCredentials(kUsername, kPassword, ""));

// Run the tasks posted to complete the login:

MessageLoop::current()->RunUntilIdle();

@@ -302,7 +302,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest,

WizardController::default_controller()->GetEnterpriseEnrollmentScreen();

EXPECT_EQ(screen, WizardController::default_controller()->current_screen());

// This is the main expectation: after auto-enrollment, login is resumed.

- EXPECT_CALL(mock_consumer, OnLoginSuccess(_, _, _, _)).Times(1);

+ EXPECT_CALL(mock_consumer, OnLoginSuccess(_, _, _)).Times(1);

OnExit(ScreenObserver::ENTERPRISE_AUTO_MAGIC_ENROLLMENT_COMPLETED);

// Prevent browser launch when the profile is prepared:

browser_shutdown::SetTryingToQuit(true);