Initialize IMF with a whitelist of input methods so that login screen doesn't need to wait for comp…

chrome/browser/chromeos/input_method/input_method_util.cc

Index: chrome/browser/chromeos/input_method/input_method_util.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc
index d4355db2c4b327f2010c29f568e2e1eade3a60cf..2c4f36c1db11ea238e17e372746ad7053b922a41 100644
--- a/chrome/browser/chromeos/input_method/input_method_util.cc
+++ b/chrome/browser/chromeos/input_method/input_method_util.cc
@@ -879,18 +879,20 @@ void InputMethodUtil::ReloadInternalMaps() {
   for (size_t i = 0; i < supported_input_methods_->size(); ++i) {
     const InputMethodDescriptor& input_method =
         supported_input_methods_->at(i);
+    const std::string input_method_id =
+        extension_ime_util::GetInputMethodIDByKeyboardLayout(input_method.id());
     const std::vector<std::string>& language_codes =
         input_method.language_codes();
     for (size_t i = 0; i < language_codes.size(); ++i) {
       language_code_to_ids_.insert(
-          std::make_pair(language_codes[i], input_method.id()));
+          std::make_pair(language_codes[i], input_method_id));
       // Remember the pairs.
       id_to_language_code_.insert(
-          std::make_pair(input_method.id(), language_codes[i]));
+          std::make_pair(input_method_id, language_codes[i]));
     }
     id_to_descriptor_.insert(
-        std::make_pair(input_method.id(), input_method));
-    if (IsKeyboardLayout(input_method.id())) {
+        std::make_pair(input_method_id, input_method));
+    if (IsKeyboardLayout(input_method_id)) {
       xkb_id_to_descriptor_.insert(
           std::make_pair(input_method.GetPreferredKeyboardLayout(),
                          input_method));