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

chrome/browser/ui/webui/chromeos/login/controller_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/controller_pairing_screen_handler.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chromeos/chromeos_switches.h"
@@ skipping 52 matching lines @@
   }
 }
 
 void ControllerPairingScreenHandler::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): Remove unnecessary strings.
   builder->Add(prefix + "WelcomeTitle", IDS_PAIRING_CONTROLLER_WELCOME);
   builder->Add(prefix + "Searching", IDS_PAIRING_CONTROLLER_SEARCHING);
   builder->Add(prefix + "HelpBtn", IDS_PAIRING_NEED_HELP);
   builder->Add(prefix + "TroubleConnectingTitle",
                IDS_PAIRING_CONTROLLER_TROUBLE_CONNECTING);
   builder->Add(prefix + "ConnectingAdvice",
                IDS_PAIRING_CONTROLLER_CONNECTING_ADVICE);
   builder->Add(prefix + "AdviceGotItBtn", IDS_PAIRING_CONTROLLER_ADVICE_GOT_IT);
   builder->Add(prefix + "SelectTitle", IDS_PAIRING_CONTROLLER_SELECT_TITLE);
   builder->Add(prefix + "ConnectBtn", IDS_PAIRING_CONTROLLER_CONNECT);
   builder->Add(prefix + "Connecting", IDS_PAIRING_CONTROLLER_CONNECTING);
   builder->Add(prefix + "ConfirmationTitle",
                IDS_PAIRING_CONTROLLER_CONFIRMATION_TITLE);
   builder->Add(prefix + "ConfirmationQuestion",
                IDS_PAIRING_CONTROLLER_CONFIRMATION_QUESTION);
   builder->Add(prefix + "RejectCodeBtn", IDS_PAIRING_CONTROLLER_REJECT_CODE);
   builder->Add(prefix + "AcceptCodeBtn", IDS_PAIRING_CONTROLLER_ACCEPT_CODE);
   builder->Add(prefix + "UpdateTitle", IDS_PAIRING_CONTROLLER_UPDATE_TITLE);
   builder->Add(prefix + "UpdateText", IDS_PAIRING_CONTROLLER_UPDATE_TEXT);
   builder->Add(prefix + "ConnectionLostTitle",
                IDS_PAIRING_CONTROLLER_CONNECTION_LOST_TITLE);
   builder->Add(prefix + "ConnectionLostText",
                IDS_PAIRING_CONTROLLER_CONNECTION_LOST_TEXT);
   builder->Add(prefix + "HostNetworkErrorTitle",
                IDS_PAIRING_CONTROLLER_HOST_NETWORK_ERROR_TITLE);
-  builder->Add(prefix + "EnrollTitle", IDS_PAIRING_CONTROLLER_ENROLL_TITLE);
+  builder->Add(prefix + "EnrollTitle", IDS_PAIRING_ENROLL_TITLE);
   builder->Add(prefix + "EnrollText1", IDS_PAIRING_CONTROLLER_ENROLL_TEXT_1);
   builder->Add(prefix + "EnrollText2", IDS_PAIRING_CONTROLLER_ENROLL_TEXT_2);
   builder->Add(prefix + "ContinueBtn", IDS_PAIRING_CONTROLLER_CONTINUE);
   builder->Add(prefix + "EnrollmentInProgress",
-               IDS_PAIRING_CONTROLLER_ENROLLMENT_IN_PROGRESS);
+               IDS_PAIRING_ENROLLMENT_IN_PROGRESS);
   builder->Add(prefix + "EnrollmentErrorTitle",
                IDS_PAIRING_ENROLLMENT_ERROR_TITLE);
   builder->Add(prefix + "EnrollmentErrorHostRestarts",
                IDS_PAIRING_CONTROLLER_ENROLLMENT_ERROR_HOST_RESTARTS);
   builder->Add(prefix + "SuccessTitle", IDS_PAIRING_CONTROLLER_SUCCESS_TITLE);
   builder->Add(prefix + "SuccessText", IDS_PAIRING_CONTROLLER_SUCCESS_TEXT);
   builder->Add(prefix + "ContinueToHangoutsBtn",
                IDS_PAIRING_CONTROLLER_CONTINUE_TO_HANGOUTS);
 
   if (IsBootstrappingMaster()) {
@@ skipping 50 matching lines @@
 void ControllerPairingScreenHandler::OnContextChanged(
     const base::DictionaryValue& diff) {
   CallJS(kMethodContextChanged, diff);
 }
 
 content::BrowserContext* ControllerPairingScreenHandler::GetBrowserContext() {
   return web_ui()->GetWebContents()->GetBrowserContext();
 }
 
 }  // namespace chromeos