Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(352)

Unified Diff: chrome/browser/chromeos/input_method/input_method_util_unittest.cc

Issue 1313533003: Fix some extern usage in .cc files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
}
}
}
« no previous file with comments | « no previous file | chrome/browser/extensions/api/cookies/cookies_api_constants.cc » ('j') | content/browser/browser_main.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698