ChromeOS: Fix "continue OOBE on restart" functionality.

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 3342221262e913cd1e877d54650bc3f0e549c1a1..5b4a3c475fe62a91ba7bdbdb42abe6eeaf4eb8fd 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -184,6 +184,11 @@ void InitializeCrashReporter() {
 }
 #endif
 
+bool UseMDOobe() {
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+      chromeos::switches::kEnableMdOobe);
+}
+
 }  // namespace
 
 namespace chromeos {
@@ -314,6 +319,10 @@ void WizardController::Init(const std::string& first_screen_name) {
   // an eligible controller is detected later.
   SetControllerDetectedPref(false);
 
+  // If flag disappeared after restart, disable.
+  if (!UseMDOobe())
+    GetLocalState()->SetBoolean(prefs::kOobeMdMode, false);
+
   AdvanceToScreen(first_screen_name_);
   if (!IsMachineHWIDCorrect() && !StartupUtils::IsDeviceRegistered() &&
       first_screen_name_.empty())
@@ -920,7 +929,9 @@ void WizardController::OnHIDScreenNecessityCheck(bool screen_needed) {
   if (screen_needed) {
     ShowHIDDetectionScreen();
   } else {
-    oobe_ui_->EnableMdOobe();
+    if (UseMDOobe())
+      GetLocalState()->SetBoolean(prefs::kOobeMdMode, true);
+
     ShowNetworkScreen();
   }
 }
@@ -976,7 +987,9 @@ void WizardController::AdvanceToScreen(const std::string& screen_name) {
             weak_factory_.GetWeakPtr());
         oobe_ui_->GetHIDDetectionView()->CheckIsScreenRequired(on_check);
       } else {
-        oobe_ui_->EnableMdOobe();
+        if (UseMDOobe())
+          GetLocalState()->SetBoolean(prefs::kOobeMdMode, true);
+
         ShowNetworkScreen();
       }
     } else {