Remove mozc from whitelist.

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 a0d9a053fb70f3c770bd7af376190a95e3240139..b79d9d2c2012b0fa66d37b4eccd2467c9a5ead3d 100644
--- a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
+++ b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
@@ -116,16 +116,6 @@ TEST_F(InputMethodUtilTest, GetInputMethodShortNameTest) {
     EXPECT_EQ(ASCIIToUTF16("CAS"), util_.GetInputMethodShortName(desc));
   }
   {
-    InputMethodDescriptor desc = GetDesc("mozc", "us", "ja");
-    EXPECT_EQ(UTF8ToUTF16("\xe3\x81\x82"),
-              util_.GetInputMethodShortName(desc));
-  }
-  {
-    InputMethodDescriptor desc = GetDesc("mozc-jp", "jp", "ja");
-    EXPECT_EQ(UTF8ToUTF16("\xe3\x81\x82"),
-              util_.GetInputMethodShortName(desc));
-  }
-  {
     InputMethodDescriptor desc = GetDesc("pinyin", "us", "zh-CN");
     EXPECT_EQ(UTF8ToUTF16("\xe6\x8b\xbc"),
               util_.GetInputMethodShortName(desc));
@@ -178,11 +168,10 @@ TEST_F(InputMethodUtilTest, GetInputMethodMediumNameTest) {
     const char * input_method_id[] = {
       "m17n:zh:cangjie",
       "m17n:zh:quick",
-      "mozc",
+      "pinyin",
       "mozc-chewing",
-      "mozc-dv",
       "mozc-hangul",
-      "mozc-jp",
+      "pinyin",
       "pinyin",
       "pinyin-dv",
     };
@@ -215,12 +204,8 @@ TEST_F(InputMethodUtilTest, GetInputMethodLongNameTest) {
               util_.GetInputMethodLongName(desc));
   }
   {
-    InputMethodDescriptor desc = GetDesc("mozc", "us", "ja");
-#if !defined(GOOGLE_CHROME_BUILD)
-    EXPECT_EQ(ASCIIToUTF16("Japanese input method (for US keyboard)"),
-#else
-    EXPECT_EQ(ASCIIToUTF16("Google Japanese Input (for US keyboard)"),
-#endif  // defined(GOOGLE_CHROME_BUILD)
+    InputMethodDescriptor desc = GetDesc("pinyin", "us", "ja");
+    EXPECT_EQ(ASCIIToUTF16("Pinyin input method"),
               util_.GetInputMethodLongName(desc));
   }
   {
@@ -291,21 +276,17 @@ TEST_F(InputMethodUtilTest, GetInputMethodLongNameTest) {
 TEST_F(InputMethodUtilTest, TestGetStringUTF8) {
   EXPECT_EQ(UTF8ToUTF16("Pinyin input method"),
             util_.TranslateString("pinyin"));
-#if !defined(GOOGLE_CHROME_BUILD)
-  EXPECT_EQ(UTF8ToUTF16("Japanese input method (for US Dvorak keyboard)"),
-            util_.TranslateString("mozc-dv"));
-#endif
 }
 
 TEST_F(InputMethodUtilTest, TestIsValidInputMethodId) {
   EXPECT_TRUE(util_.IsValidInputMethodId("xkb:us:colemak:eng"));
-  EXPECT_TRUE(util_.IsValidInputMethodId("mozc"));
+  EXPECT_TRUE(util_.IsValidInputMethodId("pinyin"));
   EXPECT_FALSE(util_.IsValidInputMethodId("unsupported-input-method"));
 }
 
 TEST_F(InputMethodUtilTest, TestIsKeyboardLayout) {
   EXPECT_TRUE(InputMethodUtil::IsKeyboardLayout("xkb:us::eng"));
-  EXPECT_FALSE(InputMethodUtil::IsKeyboardLayout("mozc"));
+  EXPECT_FALSE(InputMethodUtil::IsKeyboardLayout("pinyin"));
 }
 
 TEST_F(InputMethodUtilTest, TestGetKeyboardLayoutName) {
@@ -313,7 +294,6 @@ TEST_F(InputMethodUtilTest, TestGetKeyboardLayoutName) {
   EXPECT_EQ("", util_.GetKeyboardLayoutName("UNSUPPORTED_ID"));
 
   // Supported cases (samples).
-  EXPECT_EQ("jp", util_.GetKeyboardLayoutName("mozc-jp"));
   EXPECT_EQ("us", util_.GetKeyboardLayoutName("pinyin"));
   EXPECT_EQ("us(dvorak)", util_.GetKeyboardLayoutName("pinyin-dv"));
   EXPECT_EQ("us", util_.GetKeyboardLayoutName("m17n:ar:kbd"));
@@ -354,8 +334,8 @@ TEST_F(InputMethodUtilTest, TestGetInputMethodDescriptorFromId) {
 
 TEST_F(InputMethodUtilTest, TestGetInputMethodIdsForLanguageCode) {
   std::multimap<std::string, std::string> language_code_to_ids_map;
-  language_code_to_ids_map.insert(std::make_pair("ja", "mozc"));
-  language_code_to_ids_map.insert(std::make_pair("ja", "mozc-jp"));
+  language_code_to_ids_map.insert(std::make_pair("ja", "pinyin"));
+  language_code_to_ids_map.insert(std::make_pair("ja", "pinyin"));
   language_code_to_ids_map.insert(std::make_pair("ja", "xkb:jp:jpn"));
   language_code_to_ids_map.insert(std::make_pair("fr", "xkb:fr:fra"));
 
@@ -394,41 +374,29 @@ TEST_F(InputMethodUtilTest, TestGetFirstLoginInputMethodIds_Us_And_EnUs) {
   EXPECT_EQ("xkb:us::eng", input_method_ids[0]);
 }
 
-// US keyboard + Japanese UI = US keyboard + mozc.
-TEST_F(InputMethodUtilTest, TestGetFirstLoginInputMethodIds_Us_And_Ja) {
+// US keyboard + Chinese UI = US keyboard + Pinyin IME.
+TEST_F(InputMethodUtilTest, TestGetFirstLoginInputMethodIds_Us_And_Zh) {
   const InputMethodDescriptor* descriptor =
       util_.GetInputMethodDescriptorFromId("xkb:us::eng");  // US keyboard.
   ASSERT_TRUE(NULL != descriptor);  // ASSERT_NE doesn't compile.
   std::vector<std::string> input_method_ids;
-  util_.GetFirstLoginInputMethodIds("ja", *descriptor, &input_method_ids);
+  util_.GetFirstLoginInputMethodIds("zh-CN", *descriptor, &input_method_ids);
   ASSERT_EQ(2U, input_method_ids.size());
   EXPECT_EQ("xkb:us::eng", input_method_ids[0]);
-  EXPECT_EQ("mozc", input_method_ids[1]);  // Mozc for US keybaord.
-}
-
-// JP keyboard + Japanese UI = JP keyboard + mozc-jp.
-TEST_F(InputMethodUtilTest, TestGetFirstLoginInputMethodIds_JP_And_Ja) {
-  const InputMethodDescriptor* descriptor =
-      util_.GetInputMethodDescriptorFromId("xkb:jp::jpn");  // Japanese keyboard
-  ASSERT_TRUE(NULL != descriptor);  // ASSERT_NE doesn't compile.
-  std::vector<std::string> input_method_ids;
-  util_.GetFirstLoginInputMethodIds("ja", *descriptor, &input_method_ids);
-  ASSERT_EQ(2U, input_method_ids.size());
-  EXPECT_EQ("xkb:jp::jpn", input_method_ids[0]);
-  EXPECT_EQ("mozc-jp", input_method_ids[1]);  // Mozc for JP keybaord.
+  EXPECT_EQ("pinyin", input_method_ids[1]);  // Pinyin for US keybaord.
 }
 
-// US dvorak keyboard + Japanese UI = US dvorak keyboard + mozc-dv.
-TEST_F(InputMethodUtilTest, TestGetFirstLoginInputMethodIds_Dvorak_And_Ja) {
+// Korean keyboard + Korean UI = Korean keyboard + mozc-hangul.
+TEST_F(InputMethodUtilTest, TestGetFirstLoginInputMethodIds_KR_And_Ko) {
+  // Korean keyboard
   const InputMethodDescriptor* descriptor =
-      // US Drovak keyboard.
-      util_.GetInputMethodDescriptorFromId("xkb:us:dvorak:eng");
+      util_.GetInputMethodDescriptorFromId("xkb:kr:kr104:kor");
   ASSERT_TRUE(NULL != descriptor);  // ASSERT_NE doesn't compile.
   std::vector<std::string> input_method_ids;
-  util_.GetFirstLoginInputMethodIds("ja", *descriptor, &input_method_ids);
+  util_.GetFirstLoginInputMethodIds("ko", *descriptor, &input_method_ids);
   ASSERT_EQ(2U, input_method_ids.size());
-  EXPECT_EQ("xkb:us:dvorak:eng", input_method_ids[0]);
-  EXPECT_EQ("mozc-dv", input_method_ids[1]);  // Mozc for US Dvorak keybaord.
+  EXPECT_EQ("xkb:kr:kr104:kor", input_method_ids[0]);
+  EXPECT_EQ("mozc-hangul", input_method_ids[1]);  // Mozc for JP keybaord.
 }
 
 // US keyboard + Russian UI = US keyboard + Russsian keyboard
@@ -483,13 +451,13 @@ TEST_F(InputMethodUtilTest, TestGetLanguageCodesFromInputMethodIds) {
   std::vector<std::string> input_method_ids;
   input_method_ids.push_back("xkb:us::eng");  // English US.
   input_method_ids.push_back("xkb:us:dvorak:eng");  // English US Dvorak.
-  input_method_ids.push_back("mozc-jp");  // Japanese.
+  input_method_ids.push_back("pinyin");  // Pinyin
   input_method_ids.push_back("xkb:fr::fra");  // French France.
   std::vector<std::string> language_codes;
   util_.GetLanguageCodesFromInputMethodIds(input_method_ids, &language_codes);
   ASSERT_EQ(3U, language_codes.size());
   EXPECT_EQ("en-US", language_codes[0]);
-  EXPECT_EQ("ja", language_codes[1]);
+  EXPECT_EQ("zh-CN", language_codes[1]);
   EXPECT_EQ("fr", language_codes[2]);
 }