| Index: base/json/json_file_value_serializer.h
|
| diff --git a/base/json/json_file_value_serializer.h b/base/json/json_file_value_serializer.h
|
| index f6b4e5fc223730b523ec0094fbaa94211888c62f..67d2342b4cc16074a5e548afa02e7ddaebafcfbc 100644
|
| --- a/base/json/json_file_value_serializer.h
|
| +++ b/base/json/json_file_value_serializer.h
|
| @@ -60,8 +60,8 @@ class BASE_EXPORT JSONFileValueDeserializer : 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;
|
|
|
| // This enum is designed to safely overlap with JSONReader::JsonParseError.
|
| enum JsonFileError {
|
|
|