Remove ExtraLanguage entries from InputMethodUtil.

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 cea052c594f629be000d89ca6381341cf8d9173d..d798e09f7b60fda6d194d183baa9cc62f00f7d94 100644
--- a/chromeos/ime/input_method_whitelist.cc
+++ b/chromeos/ime/input_method_whitelist.cc
@@ -6,12 +6,15 @@
 
 #include <vector>
 
+#include "base/strings/string_util.h"
 #include "chromeos/ime/input_method_descriptor.h"
 #include "chromeos/ime/input_methods.h"
 
 namespace chromeos {
 namespace input_method {
 
+const char kLanguageDelimiter[] = ",";
+
 InputMethodWhitelist::InputMethodWhitelist() {
   for (size_t i = 0; i < arraysize(kInputMethods); ++i) {
     supported_input_methods_.insert(kInputMethods[i].input_method_id);
@@ -35,7 +38,8 @@ InputMethodWhitelist::GetSupportedInputMethods() const {
     layouts.push_back(kInputMethods[i].xkb_layout_id);
 
     std::vector<std::string> languages;
-    languages.push_back(kInputMethods[i].language_code);
+    Tokenize(kInputMethods[i].language_code, kLanguageDelimiter, &languages);
+    DCHECK(!languages.empty());
 
     input_methods->push_back(InputMethodDescriptor(
         kInputMethods[i].input_method_id,