| Index: base/json/json_string_value_serializer.h
|
| diff --git a/base/json/json_string_value_serializer.h b/base/json/json_string_value_serializer.h
|
| index 2459f48a8a4ca0913673475442a4822ff7c2ae5d..a97da23920213797d233fe0296a1c94cfde53207 100644
|
| --- a/base/json/json_string_value_serializer.h
|
| +++ b/base/json/json_string_value_serializer.h
|
| @@ -59,8 +59,8 @@ class BASE_EXPORT JSONStringValueDeserializer : public base::ValueDeserializer {
|
| // If |error_message| is non-null, it will be filled in with a formatted
|
| // error message including the location of the error if appropriate.
|
| // The caller takes ownership of the returned value.
|
| - scoped_ptr<base::Value> Deserialize(int* error_code,
|
| - std::string* error_message) override;
|
| + std::unique_ptr<base::Value> Deserialize(int* error_code,
|
| + std::string* error_message) override;
|
|
|
| void set_allow_trailing_comma(bool new_value) {
|
| allow_trailing_comma_ = new_value;
|
|
|