kiosk: Show enrollment screen first if needed.

chrome/browser/chromeos/login/wizard_controller.cc

Index: chrome/browser/chromeos/login/wizard_controller.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 452a6afda8f345ade00ad55794fe68fd87352eca..ac460cabd6399efeb516a5b9e01c3bd8714ba808 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -420,10 +420,6 @@ void WizardController::SkipToLoginForTesting(
   ShowLoginScreen(context);
 }
 
-void WizardController::SkipPostLoginScreensForTesting() {
-  skip_post_login_screens_ = true;
-}
-
 void WizardController::AddObserver(Observer* observer) {
   observer_list_.AddObserver(observer);
 }
@@ -723,7 +719,7 @@ void WizardController::AdvanceToScreen(const std::string& screen_name) {
 ///////////////////////////////////////////////////////////////////////////////
 // WizardController, chromeos::ScreenObserver overrides:
 void WizardController::OnExit(ExitCodes exit_code) {
-  LOG(INFO) << "Wizard screen exit code: " << exit_code;
+  VLOG(1) << "Wizard screen exit code: " << exit_code;
   switch (exit_code) {
     case NETWORK_CONNECTED:
       OnNetworkConnected();
@@ -827,17 +823,23 @@ void WizardController::AutoLaunchKioskApp() {
 }
 
 // static
+void WizardController::SetZeroDelays() {
+  kShowDelayMs = 0;
+  zero_delay_enabled_ = true;
+}
+
+// static
 bool WizardController::IsZeroDelayEnabled() {
   return zero_delay_enabled_;
 }
 
 // static
-void WizardController::SetZeroDelays() {
-  kShowDelayMs = 0;
-  zero_delay_enabled_ = true;
+void WizardController::SkipPostLoginScreensForTesting() {
+  skip_post_login_screens_ = true;
 }
 
-bool WizardController::ShouldAutoStartEnrollment() const {
+// static
+bool WizardController::ShouldAutoStartEnrollment() {
   return g_browser_process->browser_policy_connector()->
       GetDeviceCloudPolicyManager()->ShouldAutoStartEnrollment();
 }