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 122 matching lines @@
   histogram->AddTime(step_time);
 }
 
 bool IsRemoraRequisition() {
   return g_browser_process->platform_part()
       ->browser_policy_connector_chromeos()
       ->GetDeviceCloudPolicyManager()
       ->IsRemoraRequisition();
 }
 
+// Checks if the device is a "Slave" device in the bootstrapping process.
+bool IsBootstrappingSlave() {
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+      chromeos::switches::kOobeBootstrappingSlave);
+}
+
+// Checks if the device is a "Master" device in the bootstrapping process.
+bool IsBootstrappingMaster() {

[achuithb, 2015/12/04 09:14:11]

This is just for development, right? The master will be an android client in
production, right?

[xdai1, 2015/12/04 19:04:15]

Right. This is only for the Cros side demo and test.

+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+      chromeos::switches::kOobeBootstrappingMaster);
+}
+
 #if defined(GOOGLE_CHROME_BUILD)
 void InitializeCrashReporter() {
   // The crash reporter initialization needs IO to complete.
   DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
   breakpad::InitCrashReporter(std::string());
 }
 #endif
 
 }  // namespace
 
@@ skipping 110 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 in bootstrapping process, start the enrollment OOBE flow.
+  if (IsBootstrappingSlave() || IsBootstrappingMaster())
+    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() &&
       (first_screen_name.empty() ||
        first_screen_name == WizardController::kTestNoScreenName)) {
     first_screen_name_ = screen_pref;
   }
 
   AdvanceToScreen(first_screen_name_);
@@ skipping 295 matching lines @@
 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 (is_shark || IsBootstrappingMaster()) {
     ShowControllerPairingScreen();
   } else {
     ShowAutoEnrollmentCheckScreen();
   }
 }
 
 void WizardController::OnEulaAccepted() {
   time_eula_accepted_ = base::Time::Now();
   StartupUtils::MarkEulaAccepted();
   InitiateMetricsReportingChange(
@@ skipping 681 matching lines @@
 }
 
 bool WizardController::IsHostPairingOobe() const {
   return IsRemoraRequisition() &&
          (base::CommandLine::ForCurrentProcess()->HasSwitch(
               switches::kHostPairingOobe) ||
           shark_controller_detected_);
 }
 
 void WizardController::MaybeStartListeningForSharkConnection() {
-  if (!IsRemoraRequisition())
+  if (!IsRemoraRequisition() && !IsBootstrappingSlave())
     return;
 
   // We shouldn't be here if we are running pairing OOBE already.
   DCHECK(!IsHostPairingOobe());
 
   if (!shark_connection_listener_) {

[achuithb, 2015/12/04 09:14:10]

We need to rename this, correct? You don't have to do it in this CL.

[xdai1, 2015/12/04 19:04:15]

Yes, shark_connection_listener_ is not accurate here. Probably rename it to
controller_connection_listener_? 

     shark_connection_listener_.reset(
         new pairing_chromeos::SharkConnectionListener(
             base::Bind(&WizardController::OnSharkConnected,
                        weak_factory_.GetWeakPtr())));
   }
 }
 
 void WizardController::OnSharkConnected(
     scoped_ptr<pairing_chromeos::HostPairingController> remora_controller) {
   VLOG(1) << "OnSharkConnected";
@@ skipping 19 matching lines @@
   }
 
   EnrollmentScreen* screen = EnrollmentScreen::Get(this);
   screen->SetParameters(effective_config, shark_controller_.get(),
                         remora_controller_.get());
   SetStatusAreaVisible(true);
   SetCurrentScreen(screen);
 }
 
 }  // namespace chromeos