diff options
author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 05:45:17 +0000 |
---|---|---|
committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 05:45:17 +0000 |
commit | e59558b78e8c6a1b0bd916a724724b638c3c91b6 (patch) | |
tree | 712268a7e9e1cd552f309d89641b2bed5ad06322 /ui/base | |
parent | 31fcd34da3797bc49160620ef8c94a38652c0587 (diff) | |
download | chromium_src-e59558b78e8c6a1b0bd916a724724b638c3c91b6.zip chromium_src-e59558b78e8c6a1b0bd916a724724b638c3c91b6.tar.gz chromium_src-e59558b78e8c6a1b0bd916a724724b638c3c91b6.tar.bz2 |
Rewrite std::string("") to std::string(), Linux edition.
This patch was generated by running the empty_string clang tool
across the Chromium Linux compilation database. Implicitly or
explicitly constructing std::string() with a "" argument is
inefficient as the caller needs to emit extra instructions to
pass an argument, and the constructor needlessly copies a byte
into internal storage. Rewriting these instances to simply call
the default constructor appears to save ~14-18 kilobytes on an
optimized release build.
BUG=none
Review URL: https://codereview.chromium.org/13145003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193020 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base')
-rw-r--r-- | ui/base/gtk/menu_label_accelerator_util.cc | 2 | ||||
-rw-r--r-- | ui/base/l10n/l10n_util_unittest.cc | 60 |
2 files changed, 31 insertions, 31 deletions
diff --git a/ui/base/gtk/menu_label_accelerator_util.cc b/ui/base/gtk/menu_label_accelerator_util.cc index f8192c5..507bf99 100644 --- a/ui/base/gtk/menu_label_accelerator_util.cc +++ b/ui/base/gtk/menu_label_accelerator_util.cc @@ -46,7 +46,7 @@ std::string ConvertAcceleratorsFromWindowsStyle(const std::string& label) { } std::string RemoveWindowsStyleAccelerators(const std::string& label) { - return ConvertAmpersandsTo(label, ""); + return ConvertAmpersandsTo(label, std::string()); } // Replaces all ampersands in |label| with two ampersands. This effectively diff --git a/ui/base/l10n/l10n_util_unittest.cc b/ui/base/l10n/l10n_util_unittest.cc index 085f2d6..1fce2e2 100644 --- a/ui/base/l10n/l10n_util_unittest.cc +++ b/ui/base/l10n/l10n_util_unittest.cc @@ -124,59 +124,59 @@ TEST_F(L10nUtilTest, GetAppLocale) { // Test the support of LANGUAGE environment variable. base::i18n::SetICUDefaultLocale("en-US"); env->SetVar("LANGUAGE", "xx:fr_CA"); - EXPECT_EQ("fr", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("fr", l10n_util::GetApplicationLocale(std::string())); env->SetVar("LANGUAGE", "xx:yy:en_gb.utf-8@quot"); - EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale(std::string())); env->SetVar("LANGUAGE", "xx:zh-hk"); - EXPECT_EQ("zh-TW", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("zh-TW", l10n_util::GetApplicationLocale(std::string())); // We emulate gettext's behavior here, which ignores LANG/LC_MESSAGES/LC_ALL // when LANGUAGE is specified. If no language specified in LANGUAGE is valid, // then just fallback to the default language, which is en-US for us. base::i18n::SetICUDefaultLocale("fr-FR"); env->SetVar("LANGUAGE", "xx:yy"); - EXPECT_EQ("en-US", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("en-US", l10n_util::GetApplicationLocale(std::string())); env->SetVar("LANGUAGE", "/fr:zh_CN"); - EXPECT_EQ("zh-CN", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("zh-CN", l10n_util::GetApplicationLocale(std::string())); // Test prioritization of the different environment variables. env->SetVar("LANGUAGE", "fr"); env->SetVar("LC_ALL", "es"); env->SetVar("LC_MESSAGES", "he"); env->SetVar("LANG", "nb"); - EXPECT_EQ("fr", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("fr", l10n_util::GetApplicationLocale(std::string())); env->UnSetVar("LANGUAGE"); - EXPECT_EQ("es", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("es", l10n_util::GetApplicationLocale(std::string())); env->UnSetVar("LC_ALL"); - EXPECT_EQ("he", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("he", l10n_util::GetApplicationLocale(std::string())); env->UnSetVar("LC_MESSAGES"); - EXPECT_EQ("nb", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("nb", l10n_util::GetApplicationLocale(std::string())); env->UnSetVar("LANG"); SetDefaultLocaleForTest("ca", env.get()); - EXPECT_EQ("ca", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("ca", l10n_util::GetApplicationLocale(std::string())); SetDefaultLocaleForTest("ca-ES", env.get()); - EXPECT_EQ("ca", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("ca", l10n_util::GetApplicationLocale(std::string())); SetDefaultLocaleForTest("ca@valencia", env.get()); - EXPECT_EQ("ca@valencia", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("ca@valencia", l10n_util::GetApplicationLocale(std::string())); SetDefaultLocaleForTest("ca_ES@valencia", env.get()); - EXPECT_EQ("ca@valencia", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("ca@valencia", l10n_util::GetApplicationLocale(std::string())); SetDefaultLocaleForTest("ca_ES.UTF8@valencia", env.get()); - EXPECT_EQ("ca@valencia", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("ca@valencia", l10n_util::GetApplicationLocale(std::string())); #endif // defined(OS_POSIX) && !defined(OS_CHROMEOS) SetDefaultLocaleForTest("en-US", env.get()); - EXPECT_EQ("en-US", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("en-US", l10n_util::GetApplicationLocale(std::string())); SetDefaultLocaleForTest("xx", env.get()); - EXPECT_EQ("en-US", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("en-US", l10n_util::GetApplicationLocale(std::string())); #if defined(OS_CHROMEOS) // ChromeOS honors preferred locale first in GetApplicationLocale(), @@ -200,43 +200,43 @@ TEST_F(L10nUtilTest, GetAppLocale) { EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale("en-ZA")); #else // !defined(OS_CHROMEOS) SetDefaultLocaleForTest("en-GB", env.get()); - EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale(std::string())); SetDefaultLocaleForTest("fr-CA", env.get()); - EXPECT_EQ("fr", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("fr", l10n_util::GetApplicationLocale(std::string())); SetDefaultLocaleForTest("es-MX", env.get()); - EXPECT_EQ("es-419", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("es-419", l10n_util::GetApplicationLocale(std::string())); SetDefaultLocaleForTest("es-AR", env.get()); - EXPECT_EQ("es-419", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("es-419", l10n_util::GetApplicationLocale(std::string())); SetDefaultLocaleForTest("es-ES", env.get()); - EXPECT_EQ("es", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("es", l10n_util::GetApplicationLocale(std::string())); SetDefaultLocaleForTest("es", env.get()); - EXPECT_EQ("es", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("es", l10n_util::GetApplicationLocale(std::string())); SetDefaultLocaleForTest("zh-HK", env.get()); - EXPECT_EQ("zh-TW", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("zh-TW", l10n_util::GetApplicationLocale(std::string())); SetDefaultLocaleForTest("zh-MO", env.get()); - EXPECT_EQ("zh-TW", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("zh-TW", l10n_util::GetApplicationLocale(std::string())); SetDefaultLocaleForTest("zh-SG", env.get()); - EXPECT_EQ("zh-CN", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("zh-CN", l10n_util::GetApplicationLocale(std::string())); SetDefaultLocaleForTest("en-CA", env.get()); - EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale(std::string())); SetDefaultLocaleForTest("en-AU", env.get()); - EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale(std::string())); SetDefaultLocaleForTest("en-NZ", env.get()); - EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale(std::string())); SetDefaultLocaleForTest("en-ZA", env.get()); - EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale("")); + EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale(std::string())); #endif // defined(OS_CHROMEOS) #if defined(OS_WIN) @@ -437,7 +437,7 @@ TEST_F(L10nUtilTest, IsValidLocaleSyntax) { "sr_Latn_RS_REVISED@currency=USD")); // Test invalid locales. - EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("")); + EXPECT_FALSE(l10n_util::IsValidLocaleSyntax(std::string())); EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("x")); EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("12")); EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("456")); |