| Index: components/safe_json/json_sanitizer.cc
|
| diff --git a/components/safe_json/json_sanitizer.cc b/components/safe_json/json_sanitizer.cc
|
| index 3cffc5243cad4643d74b990901a81b3c75b5879d..3ad634d1dfb2b8cc98744343b4fa57161a93aa33 100644
|
| --- a/components/safe_json/json_sanitizer.cc
|
| +++ b/components/safe_json/json_sanitizer.cc
|
| @@ -34,7 +34,7 @@ class OopJsonSanitizer : public JsonSanitizer {
|
| friend std::default_delete<OopJsonSanitizer>;
|
| ~OopJsonSanitizer() {}
|
|
|
| - void OnParseSuccess(scoped_ptr<base::Value> value);
|
| + void OnParseSuccess(std::unique_ptr<base::Value> value);
|
| void OnParseError(const std::string& error);
|
|
|
| StringCallback success_callback_;
|
| @@ -54,9 +54,9 @@ OopJsonSanitizer::OopJsonSanitizer(const std::string& unsafe_json,
|
| base::Unretained(this)));
|
| }
|
|
|
| -void OopJsonSanitizer::OnParseSuccess(scoped_ptr<base::Value> value) {
|
| +void OopJsonSanitizer::OnParseSuccess(std::unique_ptr<base::Value> value) {
|
| // Self-destruct at the end of this method.
|
| - scoped_ptr<OopJsonSanitizer> deleter(this);
|
| + std::unique_ptr<OopJsonSanitizer> deleter(this);
|
|
|
| // A valid JSON document may only have a dictionary or list as its top-level
|
| // type, but the JSON parser also accepts other types, so we filter them out.
|
|
|