Revert 273875 "Remove the option to skip auto-update checks on OOBE."

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

Index: trunk/src/chrome/browser/chromeos/login/wizard_controller.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/login/wizard_controller.cc	(revision 274856)
+++ trunk/src/chrome/browser/chromeos/login/wizard_controller.cc	(working copy)
@@ -171,6 +171,7 @@
       host_(host),
       oobe_display_(oobe_display),
       usage_statistics_reporting_(true),
+      skip_update_enroll_after_eula_(false),
       login_screen_started_(false),
       user_image_screen_return_to_previous_hack_(false),
       timezone_resolved_(false),
@@ -536,6 +537,10 @@
   FOR_EACH_OBSERVER(Observer, observer_list_, OnSessionStart());
 }
 
+void WizardController::SkipUpdateEnrollAfterEula() {
+  skip_update_enroll_after_eula_ = true;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // WizardController, ExitHandlers:
 void WizardController::OnHIDDetectionCompleted() {
@@ -588,7 +593,13 @@
 #endif
   }
 
-  InitiateOOBEUpdate();
+  if (skip_update_enroll_after_eula_) {
+    PerformPostEulaActions();
+    PerformOOBECompletedActions();
+    ShowEnrollmentScreen();
+  } else {
+    InitiateOOBEUpdate();
+  }
 }
 
 void WizardController::OnUpdateErrorCheckingForUpdate() {