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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/policy/configuration_policy_pref_store_unittest.cc

Issue 13145003: Rewrite std::string("") to std::string(), Linux edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ugh Created 7 years, 8 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
« no previous file with comments | « chrome/browser/policy/cloud/mock_device_management_service.cc ('k') | chrome/browser/policy/policy_map_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/configuration_policy_pref_store_unittest.cc
diff --git a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
index a801f83effc639c706558ab7633b59fb2038b76b..321b3732982d78ec7d71978dc72c917fc8cec037 100644
--- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
@@ -409,9 +409,10 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptions) {
ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE));
UpdateProviderPolicy(policy);
- VerifyProxyPrefs(
- "chromium.org", "", "http://chromium.org/override",
- ProxyPrefs::MODE_FIXED_SERVERS);
+ VerifyProxyPrefs("chromium.org",
+ std::string(),
+ "http://chromium.org/override",
+ ProxyPrefs::MODE_FIXED_SERVERS);
}
TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptionsReversedApplyOrder) {
@@ -426,9 +427,10 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptionsReversedApplyOrder) {
base::Value::CreateStringValue("chromium.org"));
UpdateProviderPolicy(policy);
- VerifyProxyPrefs(
- "chromium.org", "", "http://chromium.org/override",
- ProxyPrefs::MODE_FIXED_SERVERS);
+ VerifyProxyPrefs("chromium.org",
+ std::string(),
+ "http://chromium.org/override",
+ ProxyPrefs::MODE_FIXED_SERVERS);
}
TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptionsInvalid) {
@@ -450,7 +452,8 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, NoProxyServerMode) {
base::Value::CreateIntegerValue(
ProxyPolicyHandler::PROXY_SERVER_MODE));
UpdateProviderPolicy(policy);
- VerifyProxyPrefs("", "", "", ProxyPrefs::MODE_DIRECT);
+ VerifyProxyPrefs(
+ std::string(), std::string(), std::string(), ProxyPrefs::MODE_DIRECT);
}
TEST_F(ConfigurationPolicyPrefStoreProxyTest, NoProxyModeName) {
@@ -458,7 +461,8 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, NoProxyModeName) {
policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
base::Value::CreateStringValue(ProxyPrefs::kDirectProxyModeName));
UpdateProviderPolicy(policy);
- VerifyProxyPrefs("", "", "", ProxyPrefs::MODE_DIRECT);
+ VerifyProxyPrefs(
+ std::string(), std::string(), std::string(), ProxyPrefs::MODE_DIRECT);
}
TEST_F(ConfigurationPolicyPrefStoreProxyTest, AutoDetectProxyServerMode) {
@@ -468,7 +472,10 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, AutoDetectProxyServerMode) {
base::Value::CreateIntegerValue(
ProxyPolicyHandler::PROXY_AUTO_DETECT_PROXY_SERVER_MODE));
UpdateProviderPolicy(policy);
- VerifyProxyPrefs("", "", "", ProxyPrefs::MODE_AUTO_DETECT);
+ VerifyProxyPrefs(std::string(),
+ std::string(),
+ std::string(),
+ ProxyPrefs::MODE_AUTO_DETECT);
}
TEST_F(ConfigurationPolicyPrefStoreProxyTest, AutoDetectProxyModeName) {
@@ -477,7 +484,10 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, AutoDetectProxyModeName) {
base::Value::CreateStringValue(
ProxyPrefs::kAutoDetectProxyModeName));
UpdateProviderPolicy(policy);
- VerifyProxyPrefs("", "", "", ProxyPrefs::MODE_AUTO_DETECT);
+ VerifyProxyPrefs(std::string(),
+ std::string(),
+ std::string(),
+ ProxyPrefs::MODE_AUTO_DETECT);
}
TEST_F(ConfigurationPolicyPrefStoreProxyTest, PacScriptProxyMode) {
@@ -488,7 +498,9 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, PacScriptProxyMode) {
base::Value::CreateStringValue(
ProxyPrefs::kPacScriptProxyModeName));
UpdateProviderPolicy(policy);
- VerifyProxyPrefs("", "http://short.org/proxy.pac", "",
+ VerifyProxyPrefs(std::string(),
+ "http://short.org/proxy.pac",
+ std::string(),
ProxyPrefs::MODE_PAC_SCRIPT);
}
@@ -506,15 +518,21 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, PacScriptProxyModeInvalid) {
// for unset properties.
TEST_F(ConfigurationPolicyPrefStoreProxyTest, PacScriptProxyModeBug78016) {
PolicyMap policy;
- policy.Set(key::kProxyServer, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- base::Value::CreateStringValue(""));
- policy.Set(key::kProxyPacUrl, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ policy.Set(key::kProxyServer,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER,
+ base::Value::CreateStringValue(std::string()));
+ policy.Set(key::kProxyPacUrl,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER,
base::Value::CreateStringValue("http://short.org/proxy.pac"));
policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
base::Value::CreateStringValue(
ProxyPrefs::kPacScriptProxyModeName));
UpdateProviderPolicy(policy);
- VerifyProxyPrefs("", "http://short.org/proxy.pac", "",
+ VerifyProxyPrefs(std::string(),
+ "http://short.org/proxy.pac",
+ std::string(),
ProxyPrefs::MODE_PAC_SCRIPT);
}
@@ -524,7 +542,8 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, UseSystemProxyServerMode) {
base::Value::CreateIntegerValue(
ProxyPolicyHandler::PROXY_USE_SYSTEM_PROXY_SERVER_MODE));
UpdateProviderPolicy(policy);
- VerifyProxyPrefs("", "", "", ProxyPrefs::MODE_SYSTEM);
+ VerifyProxyPrefs(
+ std::string(), std::string(), std::string(), ProxyPrefs::MODE_SYSTEM);
}
TEST_F(ConfigurationPolicyPrefStoreProxyTest, UseSystemProxyMode) {
@@ -532,7 +551,8 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, UseSystemProxyMode) {
policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
base::Value::CreateStringValue(ProxyPrefs::kSystemProxyModeName));
UpdateProviderPolicy(policy);
- VerifyProxyPrefs("", "", "", ProxyPrefs::MODE_SYSTEM);
+ VerifyProxyPrefs(
+ std::string(), std::string(), std::string(), ProxyPrefs::MODE_SYSTEM);
}
TEST_F(ConfigurationPolicyPrefStoreProxyTest,
@@ -545,7 +565,10 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest,
base::Value::CreateStringValue(
ProxyPrefs::kAutoDetectProxyModeName));
UpdateProviderPolicy(policy);
- VerifyProxyPrefs("", "", "", ProxyPrefs::MODE_AUTO_DETECT);
+ VerifyProxyPrefs(std::string(),
+ std::string(),
+ std::string(),
+ ProxyPrefs::MODE_AUTO_DETECT);
}
TEST_F(ConfigurationPolicyPrefStoreProxyTest, ProxyInvalid) {
@@ -768,7 +791,7 @@ TEST_F(ConfigurationPolicyPrefStoreDefaultSearchTest, Disabled) {
base::FundamentalValue expected_enabled(false);
EXPECT_TRUE(base::Value::Equals(&expected_enabled, value));
EXPECT_TRUE(store_->GetValue(prefs::kDefaultSearchProviderSearchURL, &value));
- base::StringValue expected_search_url("");
+ base::StringValue expected_search_url((std::string()));
EXPECT_TRUE(base::Value::Equals(&expected_search_url, value));
}
@@ -908,8 +931,10 @@ TEST_F(ConfigurationPolicyPrefStorePromptDownloadTest, Default) {
TEST_F(ConfigurationPolicyPrefStorePromptDownloadTest, SetDownloadDirectory) {
PolicyMap policy;
EXPECT_FALSE(store_->GetValue(prefs::kPromptForDownload, NULL));
- policy.Set(key::kDownloadDirectory, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, base::Value::CreateStringValue(""));
+ policy.Set(key::kDownloadDirectory,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER,
+ base::Value::CreateStringValue(std::string()));
UpdateProviderPolicy(policy);
// Setting a DownloadDirectory should disable the PromptForDownload pref.
« no previous file with comments | « chrome/browser/policy/cloud/mock_device_management_service.cc ('k') | chrome/browser/policy/policy_map_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698