Revert 275550 "Revert 275046 "ChromeOS login webui refactoring: ..."

trunk/src/chrome/browser/chromeos/login/kiosk_browsertest.cc

Index: trunk/src/chrome/browser/chromeos/login/kiosk_browsertest.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/login/kiosk_browsertest.cc	(revision 275554)
+++ trunk/src/chrome/browser/chromeos/login/kiosk_browsertest.cc	(working copy)
@@ -452,6 +452,9 @@
   }
 
   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 @@
     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);