Force enterprise enrollment flow upon detection of inconsistent state.

chrome/browser/chromeos/login/ui/login_display_host_impl.cc

Index: chrome/browser/chromeos/login/ui/login_display_host_impl.cc
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
index 4df0338cb5fc0f7092d489db7db1dc79bd333354..fee0a6ccf039cc02388f5eea9b65a72ebf4d1282 100644
--- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
+++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
@@ -1193,9 +1193,10 @@ void ShowLoginWizard(const std::string& first_screen_name) {
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   bool should_show_enrollment_screen =
-      first_screen_name.empty() && oobe_complete &&
-      chromeos::WizardController::ShouldAutoStartEnrollment() &&
-      !connector->IsEnterpriseManaged();
+      chromeos::WizardController::ShouldRecoverEnrollment() ||
+      ( first_screen_name.empty() && oobe_complete &&

[pastarmovj, 2014/07/08 12:36:31]

nit: no spaces in the braces.

[Thiemo Nagel, 2014/07/08 14:02:04]

Done.

+        chromeos::WizardController::ShouldAutoStartEnrollment() &&
+        !connector->IsEnterpriseManaged() );

[pastarmovj, 2014/07/08 12:36:31]

I think you should still respect the first_Screen_name if set and respect it.

[Thiemo Nagel, 2014/07/08 14:02:04]

Ok, thanks.

   if (should_show_enrollment_screen) {
     // Shows networks screen instead of enrollment screen to resume the
     // interrupted auto start enrollment flow because enrollment screen does