Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(589)

Unified Diff: components/safe_json/safe_json_parser_android.h

Issue 1445003002: Use std::default_delete as the default deleter for scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Windows Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;

Powered by Google App Engine
This is Rietveld 408576698