chrome/browser/chromeos/login/kiosk_browsertest.cc - Issue 296823009: 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/kiosk_browsertest.cc

Issue 296823009: ChromeOS login webui refactoring: split user selection/gaia login screens. (Closed) Base URL: http://git.chromium.org/chromium/src.git@refactoring-1

Patch Set: Update tests again Created 6 years, 6 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/app_launch_signin_screen.cc ('k') | chrome/browser/chromeos/login/screens/user_selection_screen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 0d6c85cc0ef985d8fd08219022b9a91913ab39ef..30511e4dcde38c5860acfd91d2c5e20be4e39c92 100644

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

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

@@ -452,6 +452,9 @@ class KioskTest : public OobeBaseTest {

}

void RunAppLaunchNetworkDownTest() {

+ mock_user_manager()->SetActiveUser(kTestOwnerEmail);

+ AppLaunchSigninScreen::SetUserManagerForTesting(mock_user_manager());

// Mock network could be configured with owner's password.

ScopedCanConfigureNetwork can_configure_network(true, true);

@@ -465,8 +468,6 @@ class KioskTest : public OobeBaseTest {

JsExpect("$('splash-config-network').hidden == false");

// Set up fake user manager with an owner for the test.

- mock_user_manager()->SetActiveUser(kTestOwnerEmail);

- AppLaunchSigninScreen::SetUserManagerForTesting(mock_user_manager());

static_cast<LoginDisplayHostImpl*>(LoginDisplayHostImpl::default_host())

->GetOobeUI()->ShowOobeUI(false);