components/policy/tools/generate_policy_source.py - Issue 1323923002: Remove use of JSONReader::DeprecatedRead from components/

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: components/policy/tools/generate_policy_source.py

Issue 1323923002: Remove use of JSONReader::DeprecatedRead from components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Error fix Created 5 years, 3 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 | « components/policy/core/common/cloud/component_cloud_policy_store.cc ('k') | components/proximity_auth/remote_status_update_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/policy/tools/generate_policy_source.py

diff --git a/components/policy/tools/generate_policy_source.py b/components/policy/tools/generate_policy_source.py

index 62a37fbf5c798a5fa84d3bd7068db2027e196df7..105a8606721ccff5ebf6f72953f29619ba1a0966 100755

--- a/components/policy/tools/generate_policy_source.py

+++ b/components/policy/tools/generate_policy_source.py

@@ -930,8 +930,8 @@ base::ListValue* DecodeStringList(const em::StringList& string_list) {

}

base::Value* DecodeJson(const std::string& json) {

- scoped_ptr<base::Value> root(

- base::JSONReader::DeprecatedRead(json, base::JSON_ALLOW_TRAILING_COMMAS));

+ scoped_ptr<base::Value> root =

+ base::JSONReader::Read(json, base::JSON_ALLOW_TRAILING_COMMAS);

if (!root)

LOG(WARNING) << "Invalid JSON string, ignoring: " << json;