Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(296)

Unified Diff: remoting/host/json_host_config.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
Index: remoting/host/json_host_config.cc
diff --git a/remoting/host/json_host_config.cc b/remoting/host/json_host_config.cc
index 66e518c202622706aebb888455641b44c5f67042..6c5c2e8b804650b9f467eaff778b6c10caeaef37 100644
--- a/remoting/host/json_host_config.cc
+++ b/remoting/host/json_host_config.cc
@@ -30,7 +30,8 @@ bool JsonHostConfig::Read() {
return false;
}
- scoped_ptr<Value> value(base::JSONReader::Read(file_content, true));
+ scoped_ptr<Value> value(
+ base::JSONReader::Read(file_content, base::JSON_ALLOW_TRAILING_COMMAS));
if (value.get() == NULL || !value->IsType(Value::TYPE_DICTIONARY)) {
LOG(WARNING) << "Failed to parse " << filename_.value();
return false;

Powered by Google App Engine
This is Rietveld 408576698