[Retry to merge into M50] Enable bootstrapping feature by default.

chrome/browser/ui/webui/chromeos/login/network_screen_handler.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/ui/webui/chromeos/login/network_screen_handler.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 189 matching lines @@
   // But after public user session is started, "Terms of Service" dialog is
   // shown. It is a part of OOBE UI screens, so it initiates reload of UI
   // strings in new locale. It also happens asynchronously, that leads to race
   // between "locale change", "input method change" and
   // "EnableLoginLayouts()".  This way EnableLoginLayouts() happens after user
   // input method has been changed, resetting input method to hardware default.
   //
   // So we need to disable activation of login layouts if we are already in
   // active user session.
   //
-  // 3) This is the bootstrapping process for the remora/"Slave" device. The
-  // locale & input of the remora/"Slave" device is set up by a shark/"Master"
-  // device. In this case we don't want EnableLoginLayout() to reset the input
-  // method to the hardware default method.
-  const bool is_remora = g_browser_process->platform_part()
-                             ->browser_policy_connector_chromeos()
-                             ->GetDeviceCloudPolicyManager()
-                             ->IsRemoraRequisition();
-
-  const bool is_slave = base::CommandLine::ForCurrentProcess()->HasSwitch(
-      chromeos::switches::kOobeBootstrappingSlave);
+  // 3) This is the bootstrapping process for a "Slave" device. The locale &
+  // input of the "Slave" device is set up by a "Master" device. In this case we
+  // don't want EnableLoginLayout() to reset the input method to the hardware
+  // default method.
+  const bool is_slave = g_browser_process->local_state()->GetBoolean(
+      prefs::kOobeControllerDetected);
 
   const bool enable_layouts =
-      !user_manager::UserManager::Get()->IsUserLoggedIn() && !is_slave &&
-      !is_remora;
+      !user_manager::UserManager::Get()->IsUserLoggedIn() && !is_slave;
 
   dict->Set("languageList", language_list.release());
   dict->Set(
       "inputMethodsList",
       GetAndActivateLoginKeyboardLayouts(
           application_locale, selected_input_method, enable_layouts).release());
   dict->Set("timezoneList", GetTimezoneList());
 }
 
 void NetworkScreenHandler::Initialize() {
@@ skipping 31 matching lines @@
     timezone_option->SetString("value", timezone_id);
     timezone_option->SetString("title", timezone_name);
     timezone_option->SetBoolean("selected", timezone_id == current_timezone_id);
     timezone_list->Append(timezone_option.release());
   }
 
   return timezone_list.release();
 }
 
 }  // namespace chromeos