fix "IME changed" notification uses a wrong field of IME

chrome/browser/chromeos/input_method/input_method_util_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
@@ skipping 94 matching lines @@
     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("zinnia-japanese", "us", "ja");
-    EXPECT_EQ(UTF8ToUTF16("\xe6\x89\x8b"),
-              util_.GetInputMethodShortName(desc));
-  }
-  {
     InputMethodDescriptor desc = GetDesc("pinyin", "us", "zh-CN");
     EXPECT_EQ(UTF8ToUTF16("\xe6\x8b\xbc"),
               util_.GetInputMethodShortName(desc));
   }
   {
     InputMethodDescriptor desc = GetDesc("pinyin-dv", "us(dvorak)", "zh-CN");
     EXPECT_EQ(UTF8ToUTF16("\xe6\x8b\xbc"),
               util_.GetInputMethodShortName(desc));
   }
   {
     InputMethodDescriptor desc = GetDesc("mozc-chewing", "us", "zh-TW");
     EXPECT_EQ(UTF8ToUTF16("\xe9\x85\xb7"),
               util_.GetInputMethodShortName(desc));
   }
   {
     InputMethodDescriptor desc = GetDesc("m17n:zh:cangjie", "us", "zh-TW");
     EXPECT_EQ(UTF8ToUTF16("\xe5\x80\x89"),
               util_.GetInputMethodShortName(desc));
   }
   {
     InputMethodDescriptor desc = GetDesc("m17n:zh:quick", "us", "zh-TW");
     EXPECT_EQ(UTF8ToUTF16("\xe9\x80\x9f"),
               util_.GetInputMethodShortName(desc));
   }
 }
 
+TEST_F(InputMethodUtilTest, GetInputMethodMediumNameTest) {
+  {
+    // input methods with medium name equal to short name
+    const char * input_method_id[] = {
+      "xkb:us:altgr-intl:eng",
+      "xkb:us:dvorak:eng",
+      "xkb:us:intl:eng",
+      "xkb:us:colemak:eng",
+      "english-m",
+      "xkb:de:neo:ger",
+      "xkb:es:cat:cat",
+      "xkb:gb:dvorak:eng",
+    };
+    const int len = ARRAYSIZE_UNSAFE(input_method_id);
+    for (int i=0; i<len; ++i) {
+      InputMethodDescriptor desc = GetDesc(input_method_id[i], "", "");
+      string16 medium_name = util_.GetInputMethodMediumName(desc);
+      string16 short_name = util_.GetInputMethodShortName(desc);
+      EXPECT_EQ(medium_name,short_name);
+    }
+  }
+  {
+    // input methods with medium name not equal to short name
+    const char * input_method_id[] = {
+      "m17n:zh:cangjie",
+      "m17n:zh:quick",
+      "mozc",
+      "mozc-chewing",
+      "mozc-dv",
+      "mozc-hangul",
+      "mozc-jp",
+      "pinyin",
+      "pinyin-dv",
+    };
+    const int len = ARRAYSIZE_UNSAFE(input_method_id);
+    for (int i=0; i<len; ++i) {
+      InputMethodDescriptor desc = GetDesc(input_method_id[i], "", "");
+      string16 medium_name = util_.GetInputMethodMediumName(desc);
+      string16 short_name = util_.GetInputMethodShortName(desc);
+      EXPECT_NE(medium_name,short_name);
+    }
+  }
+}
+
 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");
@@ skipping 365 matching lines @@
     EXPECT_FALSE(display_name.empty())
         << "Invalid language code " << language_code;
     // On error, GetDisplayNameForLocale() returns the |language_code| as-is.
     EXPECT_NE(language_code, UTF16ToUTF8(display_name))
         << "Invalid language code " << language_code;
   }
 }
 
 }  // namespace input_method
 }  // namespace chromeos