Revert of [Merge to M50] Enable bootstrapping feature by default.

chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.cc

Index: chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.cc
index 884f93670f098cdc29ec48e94345f038ce57b020..71f2fee96944b45c6e674b22a463e3bed88d0486 100644
--- a/chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.cc
@@ -23,6 +23,11 @@
 // TODO(dzhioev): Move 'contextReady' logic to the base screen handler when
 // all screens migrate to context-based communications.
 const char kCallbackContextReady[] = "contextReady";
+
+bool IsBootstrappingSlave() {
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+      chromeos::switches::kOobeBootstrappingSlave);
+}
 
 }  // namespace
 
@@ -60,18 +65,19 @@
   std::string prefix;
   base::RemoveChars(kJsScreenPath, ".", &prefix);
 
-  // TODO(xdai): Clean up all unrelated strings and rename others if necessary.
   builder->Add(prefix + "WelcomeTitle", IDS_PAIRING_HOST_WELCOME_TITLE);
   builder->Add(prefix + "WelcomeText", IDS_PAIRING_HOST_WELCOME_TEXT);
-  builder->Add(prefix + "ConfirmationTitle", IDS_SLAVE_CONFIRMATION_TITLE);
+  builder->Add(prefix + "ConfirmationTitle",
+               IDS_PAIRING_HOST_CONFIRMATION_TITLE);
   builder->Add(prefix + "UpdatingTitle", IDS_PAIRING_HOST_UPDATING_TITLE);
   builder->Add(prefix + "UpdatingText", IDS_PAIRING_HOST_UPDATING_TEXT);
-  builder->Add(prefix + "EnrollTitle", IDS_SLAVE_ENROLL_TITLE);
-  builder->Add(prefix + "EnrollingTitle", IDS_SLAVE_ENROLLMENT_IN_PROGRESS);
+  builder->Add(prefix + "EnrollTitle", IDS_PAIRING_ENROLL_TITLE);
+  builder->Add(prefix + "EnrollingTitle",
+               IDS_PAIRING_ENROLLMENT_IN_PROGRESS);
   builder->Add(prefix + "DoneTitle", IDS_PAIRING_HOST_DONE_TITLE);
   builder->Add(prefix + "DoneText", IDS_PAIRING_HOST_DONE_TEXT);
   builder->Add(prefix + "EnrollmentErrorTitle",
-               IDS_SLAVE_ENROLLMENT_ERROR_TITLE);
+               IDS_PAIRING_ENROLLMENT_ERROR_TITLE);
   builder->Add(prefix + "ErrorNeedsRestart",
                IDS_PAIRING_HOST_ERROR_NEED_RESTART_TEXT);
   builder->Add(prefix + "SetupBasicConfigTitle",
@@ -86,6 +92,14 @@
                IDS_PAIRING_HOST_ERROR_NEED_RESTART_TEXT);
   builder->Add(prefix + "ErrorNeedsRestart",
                IDS_PAIRING_HOST_ERROR_NEED_RESTART_TEXT);
+
+  if (IsBootstrappingSlave()) {
+    builder->Add(prefix + "ConfirmationTitle", IDS_SLAVE_CONFIRMATION_TITLE);
+    builder->Add(prefix + "EnrollTitle", IDS_SLAVE_ENROLL_TITLE);
+    builder->Add(prefix + "EnrollingTitle", IDS_SLAVE_ENROLLMENT_IN_PROGRESS);
+    builder->Add(prefix + "EnrollmentErrorTitle",
+                 IDS_SLAVE_ENROLLMENT_ERROR_TITLE);
+  }
 }
 
 void HostPairingScreenHandler::RegisterMessages() {