base/test/values_test_util.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: base/test/values_test_util.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: base/test/values_test_util.cc

diff --git a/base/test/values_test_util.cc b/base/test/values_test_util.cc

index c5dfd7946adc2333e67fa96dac955e2953126879..3e762b97eaaf41a1559a548dcea7c9983c75bc3c 100644

--- a/base/test/values_test_util.cc

+++ b/base/test/values_test_util.cc

@@ -69,7 +69,7 @@ scoped_ptr<Value> ParseJson(base::StringPiece json) {

NULL, &error_msg));

if (!result) {

ADD_FAILURE() << "Failed to parse \"" << json << "\": " << error_msg;

- result.reset(Value::CreateNullValue());

+ result = Value::CreateNullValue();

}

return result.Pass();

}

« no previous file with comments | « base/prefs/pref_service.cc ('k') | base/values.h » ('j') | no next file with comments »