Enable bootstrapping feature by default.

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

 // Copyright 2014 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/ui/webui/chromeos/login/host_pairing_screen_handler.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_screen.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/login/localized_values_builder.h"
 #include "grit/generated_resources.h"
 
 namespace chromeos {
 
 namespace {
 
 const char kJsScreenPath[] = "login.HostPairingScreen";
 
 const char kMethodContextChanged[] = "contextChanged";
 
 // Sent from JS when screen is ready to receive context updates.
 // 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
 
 HostPairingScreenHandler::HostPairingScreenHandler()
     : BaseScreenHandler(kJsScreenPath),
       delegate_(NULL),
       show_on_init_(false),
       js_context_ready_(false) {
 }
 
 HostPairingScreenHandler::~HostPairingScreenHandler() {
@@ skipping 16 matching lines @@
   }
 }
 
 void HostPairingScreenHandler::DeclareLocalizedValues(
     ::login::LocalizedValuesBuilder* builder) {
   // TODO(dzhioev): Move the prefix logic to the base screen handler after
   // migration.
   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_PAIRING_HOST_CONFIRMATION_TITLE);
+  builder->Add(prefix + "ConfirmationTitle", IDS_SLAVE_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_PAIRING_ENROLL_TITLE);
-  builder->Add(prefix + "EnrollingTitle",
-               IDS_PAIRING_ENROLLMENT_IN_PROGRESS);
+  builder->Add(prefix + "EnrollTitle", IDS_SLAVE_ENROLL_TITLE);
+  builder->Add(prefix + "EnrollingTitle", IDS_SLAVE_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_PAIRING_ENROLLMENT_ERROR_TITLE);
+               IDS_SLAVE_ENROLLMENT_ERROR_TITLE);
   builder->Add(prefix + "ErrorNeedsRestart",
                IDS_PAIRING_HOST_ERROR_NEED_RESTART_TEXT);
   builder->Add(prefix + "SetupBasicConfigTitle",
                IDS_HOST_SETUP_BASIC_CONFIGURATION_TITLE);
   builder->Add(prefix + "SetupNetworkErrorTitle",
                IDS_HOST_SETUP_NETWORK_ERROR_TITLE);
   builder->Add(prefix + "InitializationErrorTitle",
                IDS_PAIRING_HOST_INITIALIZATION_ERROR_TITLE);
   builder->Add(prefix + "ConnectionErrorTitle",
                IDS_PAIRING_HOST_CONNECTION_ERROR_TITLE);
   builder->Add(prefix + "ErrorNeedRestartText",
                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() {
   AddPrefixedCallback(kCallbackContextReady,
                       &HostPairingScreenHandler::HandleContextReady);
 }
 
 void HostPairingScreenHandler::Show() {
   if (!page_is_ready()) {
     show_on_init_ = true;
@@ skipping 14 matching lines @@
 void HostPairingScreenHandler::OnContextChanged(
     const base::DictionaryValue& diff) {
   if (!js_context_ready_) {
     context_cache_.ApplyChanges(diff, NULL);
     return;
   }
   CallJS(kMethodContextChanged, diff);
 }
 
 }  // namespace chromeos