chrome/browser/supervised_user/supervised_user_site_list.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: chrome/browser/supervised_user/supervised_user_site_list.cc

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

Patch Set: 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

« chrome/browser/extensions/api/developer_private/extension_info_generator_unittest.cc ('K') | « chrome/browser/prefs/tracked/pref_hash_browsertest.cc ('k') | chrome/browser/themes/browser_theme_pack_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/supervised_user_site_list.cc

diff --git a/chrome/browser/supervised_user/supervised_user_site_list.cc b/chrome/browser/supervised_user/supervised_user_site_list.cc

index de3baaca1f0d005c5146c509526419d93a5469eb..84ba29f79f7c4770626099dccfda189181fe8837 100644

--- a/chrome/browser/supervised_user/supervised_user_site_list.cc

+++ b/chrome/browser/supervised_user/supervised_user_site_list.cc

@@ -29,8 +29,8 @@ scoped_ptr<base::Value> ReadFileOnBlockingThread(const base::FilePath& path) {

JSONFileValueDeserializer deserializer(path);

int error_code;

std::string error_msg;

- scoped_ptr<base::Value> value(

- deserializer.Deserialize(&error_code, &error_msg));

+ scoped_ptr<base::Value> value =

+ deserializer.Deserialize(&error_code, &error_msg);

if (!value) {

LOG(ERROR) << "Couldn't load site list " << path.value() << ": "

<< error_msg;