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 f2d078f30eed712d5bca57d6971bd3bb1dfd34a7..af7e010a3ab3343c070c6246cc1fff0646dea9e0 100644 |
--- a/base/json/json_string_value_serializer.cc |
+++ b/base/json/json_string_value_serializer.cc |
@@ -48,12 +48,11 @@ JSONStringValueDeserializer::JSONStringValueDeserializer( |
JSONStringValueDeserializer::~JSONStringValueDeserializer() {} |
-Value* JSONStringValueDeserializer::Deserialize(int* error_code, |
- std::string* error_str) { |
+scoped_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) |
- .release(); |
+ json_string_, allow_trailing_comma_ ? base::JSON_ALLOW_TRAILING_COMMAS |
+ : base::JSON_PARSE_RFC, |
+ error_code, error_str); |
} |