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 cd786db9e77455b116cc9dde07987b7b4050310d..2e46ab387a20a19b9fe02735640e97907c13896f 100644 |
--- a/base/json/json_string_value_serializer.cc |
+++ b/base/json/json_string_value_serializer.cc |
@@ -41,18 +41,15 @@ bool JSONStringValueSerializer::SerializeInternal(const Value& root, |
} |
JSONStringValueDeserializer::JSONStringValueDeserializer( |
- const base::StringPiece& json_string) |
- : json_string_(json_string), |
- allow_trailing_comma_(false) { |
-} |
+ const base::StringPiece& json_string, |
+ int options) |
+ : json_string_(json_string), options_(options) {} |
JSONStringValueDeserializer::~JSONStringValueDeserializer() {} |
std::unique_ptr<Value> JSONStringValueDeserializer::Deserialize( |
int* error_code, |
std::string* error_str) { |
- return base::JSONReader::ReadAndReturnError( |
- json_string_, allow_trailing_comma_ ? base::JSON_ALLOW_TRAILING_COMMAS |
- : base::JSON_PARSE_RFC, |
- error_code, error_str); |
+ return base::JSONReader::ReadAndReturnError(json_string_, options_, |
+ error_code, error_str); |
} |