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

chrome/browser/sync/notifier/p2p_notifier.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 "chrome/browser/sync/notifier/p2p_notifier.h"
 
 #include <algorithm>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 91 matching lines @@
   dict->SetString(kSenderIdKey, sender_id_);
   dict->SetString(kNotificationTypeKey,
                   P2PNotificationTargetToString(target_));
   dict->Set(kChangedTypesKey, syncable::ModelTypeSetToValue(changed_types_));
   std::string json;
   base::JSONWriter::Write(dict.get(), &json);
   return json;
 }
 
 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;
   }
   if (!data_value->IsType(Value::TYPE_DICTIONARY)) {
     LOG(WARNING) << "Could not parse " << str << " as a dictionary";
     return false;
   }
   // TODO(akalin): Use Values::AsDictionary() when it becomes
   // available.
@@ skipping 169 matching lines @@
     const P2PNotificationData& notification_data) {
   DCHECK(parent_message_loop_proxy_->BelongsToCurrentThread());
   notifier::Notification notification;
   notification.channel = kSyncP2PNotificationChannel;
   notification.data = notification_data.ToString();
   DVLOG(1) << "Sending XMPP notification: " << notification.ToString();
   talk_mediator_->SendNotification(notification);
 }
 
 }  // namespace sync_notifier