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

Unified Diff: chrome/browser/ui/webui/options/preferences_browsertest.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
Index: chrome/browser/ui/webui/options/preferences_browsertest.cc
diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.cc b/chrome/browser/ui/webui/options/preferences_browsertest.cc
index 5839538d6ca4158a309f7aa0266d1137c006e227..8dbc971787ae6931a8ae6a78f4c9af68b328deb8 100644
--- a/chrome/browser/ui/webui/options/preferences_browsertest.cc
+++ b/chrome/browser/ui/webui/options/preferences_browsertest.cc
@@ -343,7 +343,7 @@ void PreferencesBrowserTest::VerifySetPref(const std::string& name,
std::string observed_json;
ASSERT_TRUE(content::ExecuteScriptAndExtractString(
render_view_host_, javascript.str(), &observed_json));
- VerifyObservedPref(observed_json, name, value, "", false, !commit);
+ VerifyObservedPref(observed_json, name, value, std::string(), false, !commit);
VerifyAndClearExpectations();
}
@@ -385,7 +385,7 @@ void PreferencesBrowserTest::VerifyCommit(const std::string& name,
void PreferencesBrowserTest::VerifySetCommit(const std::string& name,
const base::Value* value) {
ExpectSetCommit(name, value);
- VerifyCommit(name, value, "");
+ VerifyCommit(name, value, std::string());
VerifyAndClearExpectations();
}
@@ -476,8 +476,8 @@ IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest, FetchPrefs) {
// Verify notifications when default values are in effect.
SetupJavaScriptTestEnvironment(pref_names_, &observed_json);
- VerifyObservedPrefs(observed_json, pref_names_, default_values_,
- "", false, false);
+ VerifyObservedPrefs(
+ observed_json, pref_names_, default_values_, std::string(), false, false);
// Verify notifications when recommended values are in effect.
SetUserPolicies(policy_names_, non_default_values_,
@@ -497,8 +497,12 @@ IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest, FetchPrefs) {
ClearUserPolicies();
SetUserValues(pref_names_, non_default_values_);
SetupJavaScriptTestEnvironment(pref_names_, &observed_json);
- VerifyObservedPrefs(observed_json, pref_names_, non_default_values_,
- "", false, false);
+ VerifyObservedPrefs(observed_json,
+ pref_names_,
+ non_default_values_,
+ std::string(),
+ false,
+ false);
}
// Verifies that setting a user-modified pref value through the JavaScript
@@ -550,7 +554,7 @@ IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest, DialogPrefsSetRollback) {
ASSERT_NO_FATAL_FAILURE(SetupJavaScriptTestEnvironment(pref_names_, NULL));
for (size_t i = 0; i < pref_names_.size(); ++i) {
VerifySetPref(pref_names_[i], types_[i], non_default_values_[i], false);
- VerifyRollback(pref_names_[i], default_values_[i], "");
+ VerifyRollback(pref_names_[i], default_values_[i], std::string());
}
// Verify behavior when recommended values are in effect.
@@ -592,7 +596,7 @@ IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest, DialogPrefsClearRollback) {
ASSERT_NO_FATAL_FAILURE(SetupJavaScriptTestEnvironment(pref_names_, NULL));
for (size_t i = 0; i < pref_names_.size(); ++i) {
VerifyClearPref(pref_names_[i], default_values_[i], false);
- VerifyRollback(pref_names_[i], non_default_values_[i], "");
+ VerifyRollback(pref_names_[i], non_default_values_[i], std::string());
}
}
@@ -624,15 +628,19 @@ IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest, NotificationsOnBackendChanges) {
StartObserving();
ClearUserPolicies();
FinishObserving(&observed_json);
- VerifyObservedPrefs(observed_json, pref_names_, default_values_,
- "", false, false);
+ VerifyObservedPrefs(
+ observed_json, pref_names_, default_values_, std::string(), false, false);
// Verify notifications when user-modified values come into effect.
StartObserving();
SetUserValues(pref_names_, non_default_values_);
FinishObserving(&observed_json);
- VerifyObservedPrefs(observed_json, pref_names_, non_default_values_,
- "", false, false);
+ VerifyObservedPrefs(observed_json,
+ pref_names_,
+ non_default_values_,
+ std::string(),
+ false,
+ false);
}
#if defined(OS_CHROMEOS)
« no previous file with comments | « chrome/browser/ui/webui/options/managed_user_passphrase_handler.cc ('k') | chrome/browser/ui/webui/policy_ui_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698