chrome/browser/supervised_user/supervised_user_site_list.cc - Issue 925783002: Split ValueSerializer into separate Serializer and Deserializer classes.

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 925783002: Split ValueSerializer into separate Serializer and Deserializer classes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed cpplint warnings. Created 5 years, 10 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/profile_resetter/profile_resetter_unittest.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 b74af9feab723144ebd50ed0289f39262928baf0..90c31e18500373166492ccbee5a5dd7cca0a22ee 100644

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

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

@@ -140,9 +140,9 @@ void SupervisedUserSiteList::ParseJson(

const SupervisedUserSiteList::LoadedCallback& callback,

const std::string& json) {

if (g_load_in_process) {

- JSONFileValueSerializer serializer(path);

+ JSONFileValueDeserializer deserializer(path);

std::string error;

- scoped_ptr<base::Value> value(serializer.Deserialize(nullptr, &error));

+ scoped_ptr<base::Value> value(deserializer.Deserialize(nullptr, &error));

if (!value) {

HandleError(path, error);

return;