kiosk: Show network screen for interrupted enrollment.

http://crbug.com/322666 makes enrollment screen to be the first
screen for an interrupted auto start enrollment flow (remora). But
the enrollment screen does not handle flaky network well and often
lands user in a network error page. This CL makes the interrupted
flow resumes from network screen.

BUG=332572

Review URL: https://codereview.chromium.org/131463005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244115 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/login/login_display_host_impl.cc

@@ -1119,7 +1119,10 @@ void ShowLoginWizard(const std::string& first_screen_name) {
       chromeos::WizardController::ShouldAutoStartEnrollment() &&
       !g_browser_process->browser_policy_connector()->IsEnterpriseManaged();
   if (should_show_enrollment_screen) {
-    display_host->StartWizard(chromeos::WizardController::kEnrollmentScreenName,
+    // Shows networks screen instead of enrollment screen to resume the
+    // interrupted auto start enrollment flow because enrollment screen does
+    // not handle flaky network. See http://crbug.com/332572
+    display_host->StartWizard(chromeos::WizardController::kNetworkScreenName,
                               scoped_ptr<base::DictionaryValue>());
     return;
   }

chrome/browser/chromeos/login/login_ui_browsertest.cc

@@ -43,17 +43,17 @@ IN_PROC_BROWSER_TEST_F(LoginUITest, LoginUIVisible) {
            ".user.emailAddress == '" + std::string(kTestUser2) + "'");
 }
 
-IN_PROC_BROWSER_TEST_F(LoginUITest, PRE_ShowEnrollmentFirst) {
+IN_PROC_BROWSER_TEST_F(LoginUITest, PRE_InterruptedAutoStartEnrollment) {
   StartupUtils::MarkOobeCompleted();
 
   PrefService* prefs = g_browser_process->local_state();
   prefs->SetBoolean(prefs::kDeviceEnrollmentAutoStart, true);
 }
 
-// Tests that the default first screen is the enrollment screen after OOBE
+// Tests that the default first screen is the network screen after OOBE
 // when auto enrollment is enabled and device is not yet enrolled.
-IN_PROC_BROWSER_TEST_F(LoginUITest, ShowEnrollmentFirst) {
-  OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_ENROLLMENT).Wait();
+IN_PROC_BROWSER_TEST_F(LoginUITest, InterruptedAutoStartEnrollment) {
+  OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_NETWORK).Wait();
 }
 
 }  // namespace chromeos