Default keyboard layout should be set considering owners preference.

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

Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index cd578b63994a637190a45b1886693680a89dd329..d77856f452ef696c73b620607f04b893bcdb4479 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -1018,21 +1018,11 @@ void SigninScreenHandler::OnDnsCleared() {
   ShowSigninScreenIfReady();
 }
 
-void SigninScreenHandler::SetUserInputMethodHWDefault() {
-  chromeos::input_method::InputMethodManager* manager =
-      chromeos::input_method::InputMethodManager::Get();
-  manager->ChangeInputMethod(
-      manager->GetInputMethodUtil()->GetHardwareInputMethodId());
-}
-
 // Update keyboard layout to least recently used by the user.
 void SigninScreenHandler::SetUserInputMethod(const std::string& username) {
   chromeos::input_method::InputMethodManager* const manager =
       chromeos::input_method::InputMethodManager::Get();
 
-  const chromeos::input_method::InputMethodUtil& ime_util =
-      *manager->GetInputMethodUtil();
-
   const bool succeed = SetUserInputMethodImpl(username, manager);
 
   // This is also a case when LRU layout is set only for a few local users,
@@ -1040,10 +1030,9 @@ void SigninScreenHandler::SetUserInputMethod(const std::string& username) {
   // Otherwise they will end up using another user's locale to log in.
   if (!succeed) {
     DLOG(INFO) << "SetUserInputMethod('" << username
-               << "'): failed to set user layout. Switching to default '"
-               << ime_util.GetHardwareInputMethodId() << "'";
+               << "'): failed to set user layout. Switching to default.";
 
-    SetUserInputMethodHWDefault();
+    manager->SetInputMethodDefault();
   }
 }