Introduced switches for Master/Slave bootstrapping process.

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 cceb4996f963a248a6b420958f8f8d4d56fb10a4..924d2402d54f0fef6d79212a4d1da23db835e3ad 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -140,6 +140,18 @@ bool IsRemoraRequisition() {
       ->IsRemoraRequisition();
 }
 
+// Checks if the device is a "Slave" device in the bootstrapping process.
+bool IsBootstrappingSlave() {

[dzhioev (left Google), 2015/12/04 21:23:00]

I don't get it. Does this flag affect anything? As far as I can see, this flag
alone (w/o remora requisition) only enables a forced enrollment (meaning we show
the enrollment screen after the update phase), and that is not what we want.
With remora requisition enabled, this flag becomes meaningless. Nothing will
change if we remove it from the both places where it is checked:
1.if (IsBootstrappingSlave() || IsBootstrappingMaster())
    GetLocalState()->SetBoolean(prefs::kDeviceEnrollmentAutoStart, true);

  If remora requisition enabled, kDeviceEnrollmentAutoStart is set to true in
device_cloud_policy_manager_chromeos.cc.
2. (!IsRemoraRequisition() && !IsBootstrappingSlave())

   this expression is always false if remora requisition enabled.

Am I wrong?

+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+      chromeos::switches::kOobeBootstrappingSlave);
+}
+
+// Checks if the device is a "Master" device in the bootstrapping process.
+bool IsBootstrappingMaster() {
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+      chromeos::switches::kOobeBootstrappingMaster);
+}
+
 #if defined(GOOGLE_CHROME_BUILD)
 void InitializeCrashReporter() {
   // The crash reporter initialization needs IO to complete.
@@ -270,6 +282,10 @@ void WizardController::Init(const std::string& first_screen_name) {
     }
   }
 
+  // If the device is in bootstrapping process, start the enrollment OOBE flow.
+  if (IsBootstrappingSlave() || IsBootstrappingMaster())
+    GetLocalState()->SetBoolean(prefs::kDeviceEnrollmentAutoStart, true);

[dzhioev (left Google), 2015/12/05 00:23:33]

Could you please move this code to DeviceCloudPolicyManagerChromeOS?
DeviceCloudPolicyManagerChromeOS owns the pref and contains some non-trivial
logic for changing it. I don't think it's a good idea to change this preference
directly from here.

+
   // Use the saved screen preference from Local State.
   const std::string screen_pref =
       GetLocalState()->GetString(prefs::kOobeScreenPending);
@@ -585,7 +601,7 @@ void WizardController::OnUpdateCompleted() {
                             ->browser_policy_connector_chromeos()
                             ->GetDeviceCloudPolicyManager()
                             ->IsSharkRequisition();
-  if (is_shark) {
+  if (is_shark || IsBootstrappingMaster()) {
     ShowControllerPairingScreen();
   } else {
     ShowAutoEnrollmentCheckScreen();
@@ -1287,7 +1303,7 @@ bool WizardController::IsHostPairingOobe() const {
 }
 
 void WizardController::MaybeStartListeningForSharkConnection() {
-  if (!IsRemoraRequisition())
+  if (!IsRemoraRequisition() && !IsBootstrappingSlave())
     return;
 
   // We shouldn't be here if we are running pairing OOBE already.