chrome/browser/content_settings/content_settings_policy_provider.cc - Issue 9960077: Modify the base::JSONReader interface to take a set of options rather than a boolean flag.

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/content_settings/content_settings_policy_provider.cc

Issue 9960077: Modify the base::JSONReader interface to take a set of options rather than a boolean flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments Created 8 years, 8 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

« base/json/json_reader.h ('K') | « chrome/browser/chromeos/gdata/gdata_util.cc ('k') | chrome/browser/content_settings/host_content_settings_map_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_policy_provider.cc

diff --git a/chrome/browser/content_settings/content_settings_policy_provider.cc b/chrome/browser/content_settings/content_settings_policy_provider.cc

index 85a0631274e4d78ac813dc244399480ead56af23..f71bb4ca19f829fcd97a48019b6e801996caa294 100644

--- a/chrome/browser/content_settings/content_settings_policy_provider.cc

+++ b/chrome/browser/content_settings/content_settings_policy_provider.cc

@@ -303,8 +303,8 @@ void PolicyProvider::GetAutoSelectCertificateSettingsFromPreferences(

continue;

}

- scoped_ptr<base::Value> value(

- base::JSONReader::Read(pattern_filter_json, true));

+ scoped_ptr<base::Value> value(base::JSONReader::Read(pattern_filter_json,

+ base::JSON_ALLOW_TRAILING_COMMAS));

if (!value.get()) {

VLOG(1) << "Ignoring invalid certificate auto select setting. Reason:"

" Invalid JSON format: " << pattern_filter_json;