summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-19 05:25:00 +0000
committeryusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-19 05:25:00 +0000
commit62466568bdf7017ff508f062a4e19f9f3b3069e8 (patch)
tree0fde66d99068f705d21f62e96d2ee0e127635ac3
parent3b7c0bf1663a765ba4d0f645acf5691c5ed8032b (diff)
downloadchromium_src-62466568bdf7017ff508f062a4e19f9f3b3069e8.zip
chromium_src-62466568bdf7017ff508f062a4e19f9f3b3069e8.tar.gz
chromium_src-62466568bdf7017ff508f062a4e19f9f3b3069e8.tar.bz2
Fix unit_tests break on TOUCH_UI build.
BUG=None TEST=out/Debug/unit_tests --gtest_filter='*XK*' TBR=penghuang@chromium.org Review URL: http://codereview.chromium.org/7933008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101721 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/input_method/xkeyboard_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc b/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc
index e9b4040..76bc12f 100644
--- a/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc
+++ b/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc
@@ -169,10 +169,6 @@ TEST(XKeyboardTest, TestCreateFullXkbLayoutNameBasic) {
testee.xkey_.CreateFullXkbLayoutName(
"us(dvorak)",
GetMap(kVoidKey, kVoidKey, kVoidKey)).c_str());
- EXPECT_STREQ("gb(extd)+chromeos(disabled_disabled_disabled_keepralt),us",
- testee.xkey_.CreateFullXkbLayoutName(
- "gb(extd)",
- GetMap(kVoidKey, kVoidKey, kVoidKey)).c_str());
EXPECT_STREQ("jp+chromeos(disabled_disabled_disabled),us",
testee.xkey_.CreateFullXkbLayoutName(
"jp", // does not use AltGr, therefore no _keepralt.
@@ -204,6 +200,10 @@ TEST(XKeyboardTest, TestCreateFullXkbLayoutNameKeepCapsLock) {
"de(neo)", GetMap(kLeftControlKey,
kLeftControlKey,
kLeftControlKey)).c_str());
+ EXPECT_STREQ("gb(extd)+chromeos(disabled_disabled_disabled_keepralt),us",
+ testee.xkey_.CreateFullXkbLayoutName(
+ "gb(extd)",
+ GetMap(kVoidKey, kVoidKey, kVoidKey)).c_str());
}
TEST(XKeyboardTest, TestCreateFullXkbLayoutNameKeepAlt) {