Login screen IME policy does not apply in user session

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

Index: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
index f7a7ddd315e5bcb7772f8e1364f7810f4e5d0734..1e430c5ee3dfd537961b5ae3d97d1d2d82cb84a8 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
@@ -877,8 +877,12 @@ void GaiaScreenHandler::ShowGaiaScreenIfReady() {
     SigninScreenHandler::SetUserInputMethod(populated_email_,
                                             gaia_ime_state.get());
   } else {
-    std::vector<std::string> input_methods =
-        imm->GetInputMethodUtil()->GetHardwareLoginInputMethodIds();
+    std::vector<std::string> input_methods;
+    if (gaia_ime_state->GetAllowedInputMethods().empty())
+      input_methods =
+          imm->GetInputMethodUtil()->GetHardwareLoginInputMethodIds();

[xiyuan, 2017/04/12 17:42:07]

nit: wrap with {} and else since this takes more than one line

[pmarko, 2017/04/12 19:05:36]

Done.

+    else
+      input_methods = gaia_ime_state->GetAllowedInputMethods();
     const std::string owner_im = SigninScreenHandler::GetUserLastInputMethod(
         user_manager::UserManager::Get()->GetOwnerAccountId().GetUserEmail());
     const std::string system_im = g_browser_process->local_state()->GetString(