ChromeOS: Fix "continue OOBE on restart" functionality.

chrome/browser/chromeos/login/wizard_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 
 #include <signal.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ skipping 166 matching lines @@
 }
 
 #if defined(GOOGLE_CHROME_BUILD)
 void InitializeCrashReporter() {
   // The crash reporter initialization needs IO to complete.
   DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
   breakpad::InitCrashReporter(std::string());
 }
 #endif
 
+bool UseMDOobe() {
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+      chromeos::switches::kEnableMdOobe);
+}
+
 }  // namespace
 
 namespace chromeos {
 
 const char WizardController::kNetworkScreenName[] = "network";
 const char WizardController::kLoginScreenName[] = "login";
 const char WizardController::kUpdateScreenName[] = "update";
 const char WizardController::kUserImageScreenName[] = "image";
 const char WizardController::kEulaScreenName[] = "eula";
 const char WizardController::kEnableDebuggingScreenName[] = "debugging";
@@ skipping 110 matching lines @@
       !IsControllerDetected() &&
       (first_screen_name.empty() ||
        first_screen_name == WizardController::kTestNoScreenName)) {
     first_screen_name_ = screen_pref;
   }
   // We need to reset the kOobeControllerDetected pref to allow the user to have
   // the choice to setup the device manually. The pref will be set properly if
   // 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())
     ShowWrongHWIDScreen();
 }
 
 ErrorScreen* WizardController::GetErrorScreen() {
   return oobe_ui_->GetErrorScreen();
 }
 
@@ skipping 586 matching lines @@
   host_->SetStatusAreaVisible(visible);
 }
 
 void WizardController::OnHIDScreenNecessityCheck(bool screen_needed) {
   if (!oobe_ui_)
     return;
 
   if (screen_needed) {
     ShowHIDDetectionScreen();
   } else {
-    oobe_ui_->EnableMdOobe();
+    if (UseMDOobe())
+      GetLocalState()->SetBoolean(prefs::kOobeMdMode, true);
+
     ShowNetworkScreen();
   }
 }
 
 void WizardController::AdvanceToScreen(const std::string& screen_name) {
   if (screen_name == kNetworkScreenName) {
     ShowNetworkScreen();
   } else if (screen_name == kLoginScreenName) {
     ShowLoginScreen(LoginScreenContext());
   } else if (screen_name == kUpdateScreenName) {
@@ skipping 35 matching lines @@
       time_oobe_started_ = base::Time::Now();
       if (IsRemoraPairingOobe() || IsControllerDetected()) {
         ShowHostPairingScreen();
       } else if (CanShowHIDDetectionScreen()) {
         hid_screen_ = GetScreen(kHIDDetectionScreenName);
         base::Callback<void(bool)> on_check = base::Bind(
             &WizardController::OnHIDScreenNecessityCheck,
             weak_factory_.GetWeakPtr());
         oobe_ui_->GetHIDDetectionView()->CheckIsScreenRequired(on_check);
       } else {
-        oobe_ui_->EnableMdOobe();
+        if (UseMDOobe())
+          GetLocalState()->SetBoolean(prefs::kOobeMdMode, true);
+
         ShowNetworkScreen();
       }
     } else {
       ShowLoginScreen(LoginScreenContext());
     }
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // WizardController, BaseScreenDelegate overrides:
@@ skipping 414 matching lines @@
             : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT;
   }
 
   EnrollmentScreen* screen = EnrollmentScreen::Get(this);
   screen->SetParameters(effective_config, shark_controller_.get());
   SetStatusAreaVisible(true);
   SetCurrentScreen(screen);
 }
 
 }  // namespace chromeos