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

chrome/browser/sync/notifier/p2p_notifier.cc

Index: chrome/browser/sync/notifier/p2p_notifier.cc
diff --git a/chrome/browser/sync/notifier/p2p_notifier.cc b/chrome/browser/sync/notifier/p2p_notifier.cc
index e9b4ef20a38c7aefde4801f252d7f965bbb19773..ee3a4da6082fbde2e4e4772e4cee3c94cdc3af5d 100644
--- a/chrome/browser/sync/notifier/p2p_notifier.cc
+++ b/chrome/browser/sync/notifier/p2p_notifier.cc
@@ -109,8 +109,7 @@ std::string P2PNotificationData::ToString() const {
 }
 
 bool P2PNotificationData::ResetFromString(const std::string& str) {
-  scoped_ptr<Value> data_value(
-      base::JSONReader::Read(str, false /* allow_trailing_comma */));
+  scoped_ptr<Value> data_value(base::JSONReader::Read(str));
   if (!data_value.get()) {
     LOG(WARNING) << "Could not parse " << str;
     return false;