chrome/browser/policy/config_dir_policy_provider.cc - Issue 8423079: Allow trailing comma in JSON policy files.

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/policy/config_dir_policy_provider.cc

Issue 8423079: Allow trailing comma in JSON policy files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Added unit testing for the whole JSONValueSerializer suite. Created 9 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/policy/config_dir_policy_provider.cc

diff --git a/chrome/browser/policy/config_dir_policy_provider.cc b/chrome/browser/policy/config_dir_policy_provider.cc

index 86dde7f19192312d637c29bfdb46d4b25441bdee..c36485cc6136ba475858657c4ec27b0c93386862 100644

--- a/chrome/browser/policy/config_dir_policy_provider.cc

+++ b/chrome/browser/policy/config_dir_policy_provider.cc

@@ -34,6 +34,7 @@ DictionaryValue* ConfigDirPolicyProviderDelegate::Load() {

for (std::set<FilePath>::iterator config_file_iter = files.begin();

config_file_iter != files.end(); ++config_file_iter) {

JSONFileValueSerializer deserializer(*config_file_iter);

+ deserializer.set_allow_trailing_comma(true);

int error_code = 0;

std::string error_msg;

scoped_ptr<Value> value(deserializer.Deserialize(&error_code, &error_msg));