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

Unified Diff: components/safe_json/json_sanitizer.cc

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/json_sanitizer.cc
diff --git a/components/safe_json/json_sanitizer.cc b/components/safe_json/json_sanitizer.cc
index e00043e779804b4afc2c9fd554114424c5f8af29..aa7dc5d183918754409fc17117bfe1e8ef7b38fd 100644
--- a/components/safe_json/json_sanitizer.cc
+++ b/components/safe_json/json_sanitizer.cc
@@ -8,6 +8,7 @@
#error Build json_sanitizer_android.cc instead of this file on Android.
#endif
+#include <memory>
#include "base/bind.h"
#include "base/callback.h"
#include "base/json/json_writer.h"
@@ -27,7 +28,7 @@ class OopJsonSanitizer : public JsonSanitizer {
const StringCallback& error_callback);
private:
- friend struct base::DefaultDeleter<OopJsonSanitizer>;
+ friend std::default_delete<OopJsonSanitizer>;
~OopJsonSanitizer() {}
void OnParseSuccess(scoped_ptr<base::Value> value);

Powered by Google App Engine
This is Rietveld 408576698