base/prefs/json_pref_store.cc - Issue 1394993004: Make ValueDeserializer::Deserialize return scoped_ptr

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/prefs/json_pref_store.cc

Issue 1394993004: Make ValueDeserializer::Deserialize return scoped_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix and add todo about not failed trybot Created 5 years, 2 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/prefs/json_pref_store.cc

diff --git a/base/prefs/json_pref_store.cc b/base/prefs/json_pref_store.cc

index 87943d168ed141cf29c0894e19edf810485ea7d4..22036de6c81be2c7f7544148c019e19a854f4287 100644

--- a/base/prefs/json_pref_store.cc

+++ b/base/prefs/json_pref_store.cc

@@ -118,7 +118,7 @@ scoped_ptr<JsonPrefStore::ReadResult> ReadPrefsFromDisk(

scoped_ptr<JsonPrefStore::ReadResult> read_result(

new JsonPrefStore::ReadResult);

JSONFileValueDeserializer deserializer(path);

- read_result->value.reset(deserializer.Deserialize(&error_code, &error_msg));

+ read_result->value = deserializer.Deserialize(&error_code, &error_msg);

read_result->error =

HandleReadErrors(read_result->value.get(), path, error_code, error_msg);

read_result->no_dir = !base::PathExists(path.DirName());

« no previous file with comments | « base/json/json_value_serializer_unittest.cc ('k') | base/test/gtest_util.cc » ('j') | no next file with comments »