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

chrome/browser/chromeos/input_method/input_method_util_unittest.cc

Index: chrome/browser/chromeos/input_method/input_method_util_unittest.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
index b314c0998e01b7a83ff93ea90d3e5085091164d5..1496d4bf511d4594bb593f43b990bc12d3641c91 100644
--- a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
+++ b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
@@ -128,19 +128,7 @@ class InputMethodUtilTest : public testing::Test {
 };
 
 TEST_F(InputMethodUtilTest, GetInputMethodShortNameTest) {
-  // Test normal cases. Two-letter language code should be returned.
-  {
-    InputMethodDescriptor desc = GetDesc("m17n:fa:isiri",  // input method id
-                                         "us",  // keyboard layout name
-                                         "fa", // language name
-                                         ""); // indicator
-    EXPECT_EQ(ASCIIToUTF16("FA"), util_.GetInputMethodShortName(desc));
-  }
-  {
-    InputMethodDescriptor desc = GetDesc("mozc-hangul", "us", "ko", "");
-    EXPECT_EQ(base::UTF8ToUTF16("\xed\x95\x9c"),
-              util_.GetInputMethodShortName(desc));
-  }
+  // Test invalid cases. Two-letter language code should be returned.
   {
     InputMethodDescriptor desc = GetDesc("invalid-id", "us", "xx", "");
     // Upper-case string of the unknown language code, "xx", should be returned.
@@ -215,11 +203,8 @@ TEST_F(InputMethodUtilTest, GetInputMethodMediumNameTest) {
   {
     // input methods with medium name not equal to short name
     const char * input_method_id[] = {
-      "m17n:zh:cangjie",
-      "m17n:zh:quick",
       pinyin_ime_id,
       zhuyin_ime_id,
-      "mozc-hangul",
       pinyin_ime_id,
       pinyin_ime_id,
     };
@@ -237,21 +222,6 @@ TEST_F(InputMethodUtilTest, GetInputMethodLongNameTest) {
   // For most languages input method or keyboard layout name is returned.
   // See below for exceptions.
   {
-    InputMethodDescriptor desc = GetDesc("m17n:fa:isiri", "us", "fa", "");
-    EXPECT_EQ(ASCIIToUTF16("Persian input method (ISIRI 2901 layout)"),
-              util_.GetInputMethodLongName(desc));
-  }
-  {
-    InputMethodDescriptor desc = GetDesc("mozc-hangul", "us", "ko", "");
-    EXPECT_EQ(ASCIIToUTF16("Korean input method"),
-              util_.GetInputMethodLongName(desc));
-  }
-  {
-    InputMethodDescriptor desc = GetDesc("m17n:vi:tcvn", "us", "vi", "");
-    EXPECT_EQ(ASCIIToUTF16("Vietnamese input method (TCVN6064)"),
-              util_.GetInputMethodLongName(desc));
-  }
-  {
     InputMethodDescriptor desc = GetDesc("xkb:jp::jpn", "jp", "ja", "");
     EXPECT_EQ(ASCIIToUTF16("Japanese"),
               util_.GetInputMethodLongName(desc));
@@ -269,14 +239,9 @@ TEST_F(InputMethodUtilTest, GetInputMethodLongNameTest) {
               util_.GetInputMethodLongName(desc));
   }
 
-  // For Arabic, Dutch, French, German and Hindi,
+  // For Dutch, French, German and Hindi,
   // "language - keyboard layout" pair is returned.
   {
-    InputMethodDescriptor desc = GetDesc("m17n:ar:kbd", "us", "ar", "");
-    EXPECT_EQ(ASCIIToUTF16("Arabic - Standard input method"),
-              util_.GetInputMethodLongName(desc));
-  }
-  {
     InputMethodDescriptor desc = GetDesc("xkb:be::nld", "be", "nl", "");
     EXPECT_EQ(ASCIIToUTF16("Dutch - Belgian"),
               util_.GetInputMethodLongName(desc));
@@ -301,11 +266,6 @@ TEST_F(InputMethodUtilTest, GetInputMethodLongNameTest) {
     EXPECT_EQ(ASCIIToUTF16("German - Belgian"),
               util_.GetInputMethodLongName(desc));
   }
-  {
-    InputMethodDescriptor desc = GetDesc("m17n:hi:itrans", "us", "hi", "");
-    EXPECT_EQ(ASCIIToUTF16("Hindi - Standard input method"),
-              util_.GetInputMethodLongName(desc));
-  }
 
   {
     InputMethodDescriptor desc = GetDesc("invalid-id", "us", "xx", "");