| Index: components/safe_json/safe_json_parser_android.h
|
| diff --git a/components/safe_json/safe_json_parser_android.h b/components/safe_json/safe_json_parser_android.h
|
| index 2058731a1e04876432c16320e14090330092c77a..ef94169aea61f5b1165282642ac0645c23621e06 100644
|
| --- a/components/safe_json/safe_json_parser_android.h
|
| +++ b/components/safe_json/safe_json_parser_android.h
|
| @@ -5,7 +5,7 @@
|
| #ifndef COMPONENTS_SAFE_JSON_SAFE_JSON_PARSER_ANDROID_H_
|
| #define COMPONENTS_SAFE_JSON_SAFE_JSON_PARSER_ANDROID_H_
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| #include "components/safe_json/safe_json_parser.h"
|
|
|
| namespace safe_json {
|
| @@ -19,7 +19,7 @@ class SafeJsonParserAndroid : public SafeJsonParser {
|
| const ErrorCallback& error_callback);
|
|
|
| private:
|
| - friend struct base::DefaultDeleter<SafeJsonParserAndroid>;
|
| + friend std::default_delete<SafeJsonParserAndroid>;
|
|
|
| ~SafeJsonParserAndroid() override;
|
|
|
|
|