diff options
Diffstat (limited to 'chrome/common/json_value_serializer.cc')
-rw-r--r-- | chrome/common/json_value_serializer.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/chrome/common/json_value_serializer.cc b/chrome/common/json_value_serializer.cc index 82938ec..54afe7a 100644 --- a/chrome/common/json_value_serializer.cc +++ b/chrome/common/json_value_serializer.cc @@ -21,13 +21,11 @@ bool JSONStringValueSerializer::Serialize(const Value& root) { return true; } -bool JSONStringValueSerializer::Deserialize(Value** root, - std::string* error_message) { +Value* JSONStringValueSerializer::Deserialize(std::string* error_message) { if (!json_string_) return false; - return JSONReader::ReadAndReturnError(*json_string_, root, - allow_trailing_comma_, + return JSONReader::ReadAndReturnError(*json_string_, allow_trailing_comma_, error_message); } @@ -50,13 +48,12 @@ bool JSONFileValueSerializer::Serialize(const Value& root) { return true; } -bool JSONFileValueSerializer::Deserialize(Value** root, - std::string* error_message) { +Value* JSONFileValueSerializer::Deserialize(std::string* error_message) { std::string json_string; if (!file_util::ReadFileToString(json_file_path_, &json_string)) { return false; } JSONStringValueSerializer serializer(json_string); - return serializer.Deserialize(root, error_message); + return serializer.Deserialize(error_message); } |