Chromium Code Reviews| 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 b626640a1bfc646b15f09e4c548045ea0758266e..5fd1777b64f21b1341046639e46e2ff9eaae0465 100644 |
| --- a/base/json/json_string_value_serializer.cc |
| +++ b/base/json/json_string_value_serializer.cc |
| @@ -12,17 +12,13 @@ using base::Value; |
| JSONStringValueSerializer::JSONStringValueSerializer(std::string* json_string) |
| : json_string_(json_string), |
| - json_string_readonly_(*json_string), |
| - pretty_print_(false), |
| - allow_trailing_comma_(false) { |
| + pretty_print_(false) { |
| } |
| JSONStringValueSerializer::JSONStringValueSerializer( |
|
Matt Giuca
2015/02/16 00:18:27
You deleted this constructor in the header file, s
|
| const base::StringPiece& json_string) |
| : json_string_(nullptr), |
| - json_string_readonly_(json_string), |
| - pretty_print_(false), |
| - allow_trailing_comma_(false) { |
| + pretty_print_(false) { |
| } |
| JSONStringValueSerializer::~JSONStringValueSerializer() {} |
| @@ -50,7 +46,21 @@ bool JSONStringValueSerializer::SerializeInternal(const Value& root, |
| return base::JSONWriter::WriteWithOptions(&root, options, json_string_); |
| } |
| -Value* JSONStringValueSerializer::Deserialize(int* error_code, |
| +JSONStringValueDeserializer::JSONStringValueDeserializer( |
| + std::string* json_string) |
| + : json_string_readonly_(*json_string), |
| + allow_trailing_comma_(false) { |
| +} |
| + |
| +JSONStringValueDeserializer::JSONStringValueDeserializer( |
| + const base::StringPiece& json_string) |
| + : json_string_readonly_(json_string), |
| + allow_trailing_comma_(false) { |
| +} |
| + |
| +JSONStringValueDeserializer::~JSONStringValueDeserializer() {} |
| + |
| +Value* JSONStringValueDeserializer::Deserialize(int* error_code, |
| std::string* error_str) { |
| return base::JSONReader::ReadAndReturnError(json_string_readonly_, |
| allow_trailing_comma_ ? base::JSON_ALLOW_TRAILING_COMMAS : |