Introduced switches for Master/Slave bootstrapping process.

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 <stdlib.h>
 #include <sys/types.h>
 
@@ skipping 115 matching lines @@
   // and changes from call to call.
   base::HistogramBase* histogram = base::Histogram::FactoryTimeGet(
       histogram_name,
       base::TimeDelta::FromMilliseconds(10),
       base::TimeDelta::FromMinutes(3),
       50,
       base::HistogramBase::kUmaTargetedHistogramFlag);
   histogram->AddTime(step_time);
 }
 
-bool IsRemoraRequisition() {
-  return g_browser_process->platform_part()
-      ->browser_policy_connector_chromeos()
-      ->GetDeviceCloudPolicyManager()
-      ->IsRemoraRequisition();
+bool IsBootstrappingRemora() {
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+      chromeos::switches::kOobeBootstrappingRemora);
+}
+
+bool IsBootstrappingShark() {
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+      chromeos::switches::kOobeBootstrappingShark);
 }
 
 #if defined(GOOGLE_CHROME_BUILD)
 void InitializeCrashReporter() {
   // The crash reporter initialization needs IO to complete.
   DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
   breakpad::InitCrashReporter(std::string());
 }
 #endif
 
@@ skipping 112 matching lines @@
     if (status == PrefService::INITIALIZATION_STATUS_ERROR) {
       OnLocalStateInitialized(false);
       return;
     } else if (status == PrefService::INITIALIZATION_STATUS_WAITING) {
       GetLocalState()->AddPrefInitObserver(
           base::Bind(&WizardController::OnLocalStateInitialized,
                      weak_factory_.GetWeakPtr()));
     }
   }
 
+  // If the device is remora or shark, start the enrollment OOBE process.
+  if (IsBootstrappingRemora() || IsBootstrappingShark())
+    GetLocalState()->SetBoolean(prefs::kDeviceEnrollmentAutoStart, true);
+
   // Use the saved screen preference from Local State.
   const std::string screen_pref =
       GetLocalState()->GetString(prefs::kOobeScreenPending);
-  if (is_out_of_box_ && !screen_pref.empty() && !IsHostPairingOobe() &&
+  if (is_out_of_box_ && !screen_pref.empty() && !IsBootstrappingRemoraOobe() &&
       (first_screen_name.empty() ||
        first_screen_name == WizardController::kTestNoScreenName)) {
     first_screen_name_ = screen_pref;
   }
 
   AdvanceToScreen(first_screen_name_);
   if (!IsMachineHWIDCorrect() && !StartupUtils::IsDeviceRegistered() &&
       first_screen_name_.empty())
     ShowWrongHWIDScreen();
 }
@@ skipping 287 matching lines @@
   // should report some error message here and stay on the same screen.
   ShowLoginScreen(LoginScreenContext());
 }
 
 void WizardController::OnConnectionFailed() {
   // TODO(dpolukhin): show error message after login screen is displayed.
   ShowLoginScreen(LoginScreenContext());
 }
 
 void WizardController::OnUpdateCompleted() {
-  const bool is_shark = g_browser_process->platform_part()
-                            ->browser_policy_connector_chromeos()
-                            ->GetDeviceCloudPolicyManager()
-                            ->IsSharkRequisition();
-  if (is_shark) {
+  if (IsBootstrappingShark()) {
     ShowControllerPairingScreen();
   } else {
     ShowAutoEnrollmentCheckScreen();
   }
 }
 
 void WizardController::OnEulaAccepted() {
   time_eula_accepted_ = base::Time::Now();
   StartupUtils::MarkEulaAccepted();
   InitiateMetricsReportingChange(
@@ skipping 315 matching lines @@
     ShowHIDDetectionScreen();
   } else if (screen_name == kControllerPairingScreenName) {
     ShowControllerPairingScreen();
   } else if (screen_name == kHostPairingScreenName) {
     ShowHostPairingScreen();
   } else if (screen_name == kDeviceDisabledScreenName) {
     ShowDeviceDisabledScreen();
   } else if (screen_name != kTestNoScreenName) {
     if (is_out_of_box_) {
       time_oobe_started_ = base::Time::Now();
-      if (IsHostPairingOobe()) {
+      if (IsBootstrappingRemoraOobe()) {
         ShowHostPairingScreen();
       } else if (CanShowHIDDetectionScreen()) {
         hid_screen_ = GetScreen(kHIDDetectionScreenName);
         base::Callback<void(bool)> on_check = base::Bind(
             &WizardController::OnHIDScreenNecessityCheck,
             weak_factory_.GetWeakPtr());
         oobe_display_->GetHIDDetectionView()->CheckIsScreenRequired(on_check);
       } else {
         ShowNetworkScreen();
       }
@@ skipping 337 matching lines @@
 
 bool WizardController::SetOnTimeZoneResolvedForTesting(
     const base::Closure& callback) {
   if (timezone_resolved_)
     return false;
 
   on_timezone_resolved_for_testing_ = callback;
   return true;
 }
 
-bool WizardController::IsHostPairingOobe() const {
-  return IsRemoraRequisition() &&
-         (base::CommandLine::ForCurrentProcess()->HasSwitch(
-              switches::kHostPairingOobe) ||
-          shark_controller_detected_);
+bool WizardController::IsBootstrappingRemoraOobe() const {
+  return IsBootstrappingRemora() && shark_controller_detected_;
 }
 
 void WizardController::MaybeStartListeningForSharkConnection() {
-  if (!IsRemoraRequisition())
+  if (!IsBootstrappingRemora())
     return;
 
-  // We shouldn't be here if we are running pairing OOBE already.
-  DCHECK(!IsHostPairingOobe());
+  // We shouldn't be here if we are running bootstrapping OOBE already.
+  DCHECK(!IsBootstrappingRemoraOobe());
 
   if (!shark_connection_listener_) {
     shark_connection_listener_.reset(
         new pairing_chromeos::SharkConnectionListener(
             base::Bind(&WizardController::OnSharkConnected,
                        weak_factory_.GetWeakPtr())));
   }
 }
 
 void WizardController::OnSharkConnected(
@@ skipping 21 matching lines @@
   }
 
   EnrollmentScreen* screen = EnrollmentScreen::Get(this);
   screen->SetParameters(effective_config, shark_controller_.get(),
                         remora_controller_.get());
   SetStatusAreaVisible(true);
   SetCurrentScreen(screen);
 }
 
 }  // namespace chromeos