summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
diff options
context:
space:
mode:
authoryusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-26 07:29:47 +0000
committeryusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-26 07:29:47 +0000
commit336d73bce747b8599bfa8158726809e2b3f64559 (patch)
tree492b8dfb413b434ead86a0d5b8d0c27299b96368 /chrome/browser/chromeos/input_method/input_method_util_unittest.cc
parent780969436a8401a46674291aab6739ff7f609a40 (diff)
downloadchromium_src-336d73bce747b8599bfa8158726809e2b3f64559.zip
chromium_src-336d73bce747b8599bfa8158726809e2b3f64559.tar.gz
chromium_src-336d73bce747b8599bfa8158726809e2b3f64559.tar.bz2
Update third_party/cros to ad01339359035843814ef9c0e8a3ce01fc8de8cd.
BUG=chromium-os:14241 TEST=ran try Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=82980 Review URL: http://codereview.chromium.org/6902018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82992 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.cc15
1 files changed, 8 insertions, 7 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 bc74fe2..9a867e4 100644
--- a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
+++ b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
@@ -81,19 +81,20 @@ TEST_F(InputMethodUtilTest, IsKeyboardLayout) {
TEST_F(InputMethodUtilTest, GetLanguageCodeFromDescriptor) {
EXPECT_EQ("ja", GetLanguageCodeFromDescriptor(
- InputMethodDescriptor("mozc", "Mozc", "us", "ja")));
+ InputMethodDescriptor("mozc", "Mozc", "us", "us", "ja")));
EXPECT_EQ("zh-TW", GetLanguageCodeFromDescriptor(
- InputMethodDescriptor("mozc-chewing", "Chewing", "us", "zh")));
+ InputMethodDescriptor("mozc-chewing", "Chewing", "us", "us", "zh")));
EXPECT_EQ("zh-TW", GetLanguageCodeFromDescriptor(
- InputMethodDescriptor("m17n:zh:cangjie", "Cangjie", "us", "zh")));
+ InputMethodDescriptor("m17n:zh:cangjie", "Cangjie", "us", "us", "zh")));
EXPECT_EQ("zh-TW", GetLanguageCodeFromDescriptor(
- InputMethodDescriptor("m17n:zh:quick", "Quick", "us", "zh")));
+ InputMethodDescriptor("m17n:zh:quick", "Quick", "us", "us", "zh")));
EXPECT_EQ("zh-CN", GetLanguageCodeFromDescriptor(
- InputMethodDescriptor("pinyin", "Pinyin", "us", "zh")));
+ InputMethodDescriptor("pinyin", "Pinyin", "us", "us", "zh")));
EXPECT_EQ("en-US", GetLanguageCodeFromDescriptor(
- InputMethodDescriptor("xkb:us::eng", "USA", "us", "eng")));
+ InputMethodDescriptor("xkb:us::eng", "USA", "us", "us", "eng")));
EXPECT_EQ("en-UK", GetLanguageCodeFromDescriptor(
- InputMethodDescriptor("xkb:uk::eng", "United Kingdom", "us", "eng")));
+ InputMethodDescriptor("xkb:uk::eng", "United Kingdom",
+ "us", "us", "eng")));
}
TEST_F(InputMethodUtilTest, GetKeyboardLayoutName) {