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

Unified Diff: jingle/glue/utils.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: jingle/glue/utils.cc
diff --git a/jingle/glue/utils.cc b/jingle/glue/utils.cc
index ffbd23c0df7e5d51d51a8bd33873890ba5cbe080..03730ad6a34adeb2ec50c1b2ba5126b307de8843 100644
--- a/jingle/glue/utils.cc
+++ b/jingle/glue/utils.cc
@@ -59,7 +59,8 @@ std::string SerializeP2PCandidate(const cricket::Candidate& candidate) {
bool DeserializeP2PCandidate(const std::string& candidate_str,
cricket::Candidate* candidate) {
- scoped_ptr<Value> value(base::JSONReader::Read(candidate_str, true));
+ scoped_ptr<Value> value(
+ base::JSONReader::Read(candidate_str, base::JSON_ALLOW_TRAILING_COMMAS));
if (!value.get() || !value->IsType(Value::TYPE_DICTIONARY)) {
return false;
}

Powered by Google App Engine
This is Rietveld 408576698