diff options
| author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-29 23:18:57 +0000 |
|---|---|---|
| committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-29 23:18:57 +0000 |
| commit | c8d4e946b833c90100a52b52d673ab9ede8a511a (patch) | |
| tree | 83296d9fac0c57e9c33d2aaa546e14157862283d /chrome/browser/chromeos/input_method/input_method_util_unittest.cc | |
| parent | 39e11d7770167957024e252ac1a30a54be5179e2 (diff) | |
| download | chromium_src-c8d4e946b833c90100a52b52d673ab9ede8a511a.zip chromium_src-c8d4e946b833c90100a52b52d673ab9ede8a511a.tar.gz chromium_src-c8d4e946b833c90100a52b52d673ab9ede8a511a.tar.bz2 | |
Move InputMethodLibrary from cros to input_method
Along the way, rename the class to InputMethodManager.
BUG=chromium-os:16238
TEST=input methods work as before on the netbook. chrome works as before on the desktop.
Review URL: http://codereview.chromium.org/7230062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91047 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/input_method/input_method_util_unittest.cc')
| -rw-r--r-- | chrome/browser/chromeos/input_method/input_method_util_unittest.cc | 7 |
1 files changed, 3 insertions, 4 deletions
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 6e889c5d..669ae75 100644 --- a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc @@ -133,10 +133,9 @@ TEST_F(InputMethodUtilTest, GetInputMethodDescriptorFromId) { ASSERT_TRUE(NULL != descriptor); // ASSERT_NE doesn't compile. EXPECT_EQ("pinyin", descriptor->id); EXPECT_EQ("us", descriptor->keyboard_layout); - // This is not zh-CN as the language code in InputMethodDescriptor is - // not normalized to our format. The normalization is done in - // GetLanguageCodeFromDescriptor(). - EXPECT_EQ("zh", descriptor->language_code); + // This used to be "zh" but now we have "zh-CN" in ibus_input_methods.h, + // hence this should be zh-CN now. + EXPECT_EQ("zh-CN", descriptor->language_code); } TEST_F(InputMethodUtilTest, GetLanguageNativeDisplayNameFromCode) { |