Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: trunk/src/chrome/browser/chromeos/login/kiosk_browsertest.cc

Issue 317243006: Revert 275046 "ChromeOS login webui refactoring: split user sele..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
Index: trunk/src/chrome/browser/chromeos/login/kiosk_browsertest.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/login/kiosk_browsertest.cc (revision 275549)
+++ trunk/src/chrome/browser/chromeos/login/kiosk_browsertest.cc (working copy)
@@ -452,9 +452,6 @@
}
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);
@@ -468,6 +465,8 @@
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);

Powered by Google App Engine
This is Rietveld 408576698