diff options
| author | kochi@chromium.org <kochi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-30 06:29:49 +0000 |
|---|---|---|
| committer | kochi@chromium.org <kochi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-30 06:29:49 +0000 |
| commit | d47d489fd2adcfa31f7aff05f85d150765ce5832 (patch) | |
| tree | 38d85adb353ae437cfd5755d942415bd34c96775 | |
| parent | 09eec05bc4438bc6e9f7ca09aef973ea703a45d9 (diff) | |
| download | chromium_src-d47d489fd2adcfa31f7aff05f85d150765ce5832.zip chromium_src-d47d489fd2adcfa31f7aff05f85d150765ce5832.tar.gz chromium_src-d47d489fd2adcfa31f7aff05f85d150765ce5832.tar.bz2 | |
Fix unittest for running Google Chrome builds.
For Google Chrome builds, we use "Google Japanese Inputi (for US keyboard)"
while Chromium builds we use "japanese input method (for US keyboard)".
BUG=none
TEST=unit_tests --gtest_filter="InputMethodMenu*" for Chromium and Google Chrome builds.
Review URL: http://codereview.chromium.org/7248055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91094 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/status/input_method_menu_unittest.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/status/input_method_menu_unittest.cc b/chrome/browser/chromeos/status/input_method_menu_unittest.cc index beebe873..4662405 100644 --- a/chrome/browser/chromeos/status/input_method_menu_unittest.cc +++ b/chrome/browser/chromeos/status/input_method_menu_unittest.cc @@ -123,7 +123,11 @@ TEST(InputMethodMenuTest, GetTextForMenuTest) { } { InputMethodDescriptor desc("mozc", "us", "us", "ja"); +#if !defined(GOOGLE_CHROME_BUILD) EXPECT_EQ(L"Japanese input method (for US keyboard)", +#else + EXPECT_EQ(L"Google Japanese Input (for US keyboard)", +#endif // defined(GOOGLE_CHROME_BUILD) InputMethodMenu::GetTextForMenu(desc)); } { |