chrome/browser/prefs/pref_model_associator_unittest.cc - Issue 1129083003: More base::Values-related bare pointer -> scoped_ptr conversions

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

« no previous file with comments | « chrome/browser/extensions/api/settings_private/settings_private_apitest.cc ('k') | chrome/browser/prefs/prefs_syncable_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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);