| Index: chrome/browser/chromeos/input_method/input_method_util_unittest.cc
|
| 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 d44f60932148e8ca1d34aecbbe4b4e3d309253ba..c53a7c17ea688023e8dbd97c59acf9c3680a94cc 100644
|
| --- a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
|
| +++ b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
|
| @@ -20,8 +20,6 @@ using base::ASCIIToUTF16;
|
|
|
| namespace chromeos {
|
|
|
| -extern const char* kExtensionImePrefix;
|
| -
|
| namespace input_method {
|
|
|
| namespace {
|
| @@ -109,7 +107,8 @@ class InputMethodUtilTest : public testing::Test {
|
| GURL()); // input view page url
|
| }
|
|
|
| - static base::string16 GetDisplayLanguageName(const std::string& language_code) {
|
| + static base::string16 GetDisplayLanguageName(
|
| + const std::string& language_code) {
|
| return l10n_util::GetDisplayNameForLocale(language_code, "en", true);
|
| }
|
|
|
| @@ -174,35 +173,30 @@ TEST_F(InputMethodUtilTest, GetInputMethodShortNameTest) {
|
| 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",
|
| - "xkb:de:neo:ger",
|
| - "xkb:es:cat:cat",
|
| - "xkb:gb:dvorak:eng",
|
| + const char* const input_method_id[] = {
|
| + "xkb:us:altgr-intl:eng", "xkb:us:dvorak:eng", "xkb:us:intl:eng",
|
| + "xkb:us:colemak:eng", "xkb:de:neo:ger", "xkb:es:cat:cat",
|
| + "xkb:gb:dvorak:eng",
|
| };
|
| const int len = arraysize(input_method_id);
|
| - for (int i=0; i<len; ++i) {
|
| + for (int i = 0; i < len; ++i) {
|
| InputMethodDescriptor desc = GetDesc(input_method_id[i], "", "", "");
|
| base::string16 medium_name = util_.GetInputMethodMediumName(desc);
|
| base::string16 short_name = util_.GetInputMethodShortName(desc);
|
| - EXPECT_EQ(medium_name,short_name);
|
| + EXPECT_EQ(medium_name, short_name);
|
| }
|
| }
|
| {
|
| // input methods with medium name not equal to short name
|
| - const char * input_method_id[] = {
|
| - pinyin_ime_id,
|
| - zhuyin_ime_id,
|
| + const char* const input_method_id[] = {
|
| + pinyin_ime_id, zhuyin_ime_id,
|
| };
|
| const int len = arraysize(input_method_id);
|
| - for (int i=0; i<len; ++i) {
|
| + for (int i = 0; i < len; ++i) {
|
| InputMethodDescriptor desc = GetDesc(input_method_id[i], "", "", "");
|
| base::string16 medium_name = util_.GetInputMethodMediumName(desc);
|
| base::string16 short_name = util_.GetInputMethodShortName(desc);
|
| - EXPECT_NE(medium_name,short_name);
|
| + EXPECT_NE(medium_name, short_name);
|
| }
|
| }
|
| }
|
|
|