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

base/json/json_string_value_serializer.cc

Index: base/json/json_string_value_serializer.cc
diff --git a/base/json/json_string_value_serializer.cc b/base/json/json_string_value_serializer.cc
index 3045fa5a57f560a19db2366c491d11f32aee9980..59c0765faa512b46ba80b264408822a4a931b0fb 100644
--- a/base/json/json_string_value_serializer.cc
+++ b/base/json/json_string_value_serializer.cc
@@ -40,7 +40,7 @@ Value* JSONStringValueSerializer::Deserialize(int* error_code,
     return NULL;
 
   return base::JSONReader::ReadAndReturnError(*json_string_,
-                                              allow_trailing_comma_,
-                                              error_code,
-                                              error_str);
+      allow_trailing_comma_ ? base::JSON_ALLOW_TRAILING_COMMAS :
+          base::JSON_PARSE_RFC,
+      error_code, error_str);
 }