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

Unified Diff: chrome/browser/policy/policy_map_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
Index: chrome/browser/policy/policy_map_unittest.cc
diff --git a/chrome/browser/policy/policy_map_unittest.cc b/chrome/browser/policy/policy_map_unittest.cc
index a2f6207713a4e367ba7d94e0f33332b91ff0cd43..367ce068a860c99b40298a80d24edeae6da53f46 100644
--- a/chrome/browser/policy/policy_map_unittest.cc
+++ b/chrome/browser/policy/policy_map_unittest.cc
@@ -103,9 +103,13 @@ TEST(PolicyMapTest, MergeFrom) {
Value::CreateBooleanValue(false));
b.Set(key::kBookmarkBarEnabled, POLICY_LEVEL_RECOMMENDED,
POLICY_SCOPE_MACHINE, Value::CreateBooleanValue(true));
- b.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, Value::CreateStringValue(""));
- b.Set(key::kDisableSpdy, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
+ b.Set(key::kDefaultSearchProviderSearchURL,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE,
+ Value::CreateStringValue(std::string()));
+ b.Set(key::kDisableSpdy,
+ POLICY_LEVEL_RECOMMENDED,
+ POLICY_SCOPE_USER,
Value::CreateBooleanValue(true));
a.MergeFrom(b);
@@ -121,8 +125,10 @@ TEST(PolicyMapTest, MergeFrom) {
c.Set(key::kBookmarkBarEnabled, POLICY_LEVEL_RECOMMENDED,
POLICY_SCOPE_MACHINE, Value::CreateBooleanValue(true));
// POLICY_LEVEL_MANDATORY over POLICY_LEVEL_RECOMMENDED.
- c.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, Value::CreateStringValue(""));
+ c.Set(key::kDefaultSearchProviderSearchURL,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE,
+ Value::CreateStringValue(std::string()));
// Merge new ones.
c.Set(key::kDisableSpdy, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
Value::CreateBooleanValue(true));
« no previous file with comments | « chrome/browser/policy/configuration_policy_pref_store_unittest.cc ('k') | chrome/browser/policy/policy_prefs_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698