Modify the base::JSONReader interface to take a set of options rather than a boolean flag.

jingle/glue/utils.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "jingle/glue/utils.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 41 matching lines @@
   value.SetDouble("preference", candidate.preference());
   value.SetInteger("generation", candidate.generation());
 
   std::string result;
   base::JSONWriter::Write(&value, &result);
   return result;
 }
 
 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;
   }
 
   DictionaryValue* dic_value = static_cast<DictionaryValue*>(value.get());
 
   std::string name;
   std::string ip;
   int port;
   std::string type;
@@ skipping 21 matching lines @@
   candidate->set_protocol(protocol);
   candidate->set_username(username);
   candidate->set_password(password);
   candidate->set_preference(static_cast<float>(preference));
   candidate->set_generation(generation);
 
   return true;
 }
 
 }  // namespace jingle_glue