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

Unified Diff: chrome/browser/prefs/pref_model_associator_unittest.cc

Issue 1129083003: More base::Values-related bare pointer -> scoped_ptr conversions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix bad merge Created 5 years, 7 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/prefs/pref_model_associator_unittest.cc
diff --git a/chrome/browser/prefs/pref_model_associator_unittest.cc b/chrome/browser/prefs/pref_model_associator_unittest.cc
index 3bdf8dc985436a5f5ef9d9064d7d39afd0efa98c..14b2508bed7e6a4e280b64f94a0ef798d3efac1b 100644
--- a/chrome/browser/prefs/pref_model_associator_unittest.cc
+++ b/chrome/browser/prefs/pref_model_associator_unittest.cc
@@ -96,7 +96,7 @@ TEST_F(ListPreferenceMergeTest, LocalEmpty) {
}
TEST_F(ListPreferenceMergeTest, ServerNull) {
- scoped_ptr<base::Value> null_value(base::Value::CreateNullValue());
+ scoped_ptr<base::Value> null_value = base::Value::CreateNullValue();
{
ListPrefUpdate update(pref_service_, prefs::kURLsToRestoreOnStartup);
base::ListValue* local_list_value = update.Get();
@@ -233,7 +233,7 @@ TEST_F(DictionaryPreferenceMergeTest, LocalEmpty) {
}
TEST_F(DictionaryPreferenceMergeTest, ServerNull) {
- scoped_ptr<base::Value> null_value(base::Value::CreateNullValue());
+ scoped_ptr<base::Value> null_value = base::Value::CreateNullValue();
{
DictionaryPrefUpdate update(pref_service_,
prefs::kContentSettingsPatternPairs);

Powered by Google App Engine
This is Rietveld 408576698