Adds whitelisted non-extension-based input methods if no component extensions are at present (e.g. …

chromeos/ime/input_method_whitelist.cc

Index: chromeos/ime/input_method_whitelist.cc
diff --git a/chromeos/ime/input_method_whitelist.cc b/chromeos/ime/input_method_whitelist.cc
index 57704e54b3bd84c672c976a7984a7d00c6753879..bc71851e242b42ea00022ba7b7776545065a5f10 100644
--- a/chromeos/ime/input_method_whitelist.cc
+++ b/chromeos/ime/input_method_whitelist.cc
@@ -7,6 +7,7 @@
 #include <vector>
 
 #include "base/strings/string_util.h"
+#include "chromeos/ime/extension_ime_util.h"
 #include "chromeos/ime/input_method_descriptor.h"
 #include "chromeos/ime/input_methods.h"
 
@@ -42,7 +43,8 @@ InputMethodWhitelist::GetSupportedInputMethods() const {
     DCHECK(!languages.empty());
 
     input_methods->push_back(InputMethodDescriptor(
-        kInputMethods[i].input_method_id,
+        extension_ime_util::GetInputMethodIDByKeyboardLayout(
+            kInputMethods[i].input_method_id),
         "",
         kInputMethods[i].indicator,
         layouts,