Use std::default_delete as the default deleter for scoped_ptr.

The aim is to make scoped_ptr and std::unique_ptr functionally
identical so scoped_ptr can simply be a typedef.

BUG=554298

Review URL: https://codereview.chromium.org/1445003002

Cr-Commit-Position: refs/heads/master@{#360539}

4 files changed, 22 insertions, 33 deletions

diff --git a/media/video/video_decode_accelerator.cc b/media/video/video_decode_accelerator.cc
index 0c6b2b9..7449a2a 100644
--- a/media/video/video_decode_accelerator.cc
+++ b/media/video/video_decode_accelerator.cc
@@ -38,14 +38,11 @@ VideoDecodeAccelerator::SupportedProfile::~SupportedProfile() {
 
 } // namespace media
 
-namespace base {
+namespace std {
 
-void DefaultDeleter<media::VideoDecodeAccelerator>::operator()(
-    void* video_decode_accelerator) const {
-  static_cast<media::VideoDecodeAccelerator*>(video_decode_accelerator)->
-      Destroy();
+void default_delete<media::VideoDecodeAccelerator>::operator()(
+    media::VideoDecodeAccelerator* vda) const {
+  vda->Destroy();
 }
 
-}  // namespace base
-
-
+}  // namespace std
diff --git a/media/video/video_decode_accelerator.h b/media/video/video_decode_accelerator.h
index a53e352..e2bcdf6 100644
--- a/media/video/video_decode_accelerator.h
+++ b/media/video/video_decode_accelerator.h
@@ -5,6 +5,7 @@
 #ifndef MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_
 #define MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_
 
+#include <memory>
 #include <vector>
 
 #include "base/basictypes.h"
@@ -190,19 +191,15 @@ class MEDIA_EXPORT VideoDecodeAccelerator {
 
 }  // namespace media
 
-namespace base {
+namespace std {
 
-template <class T>
-struct DefaultDeleter;
-
-// Specialize DefaultDeleter so that scoped_ptr<VideoDecodeAccelerator> always
+// Specialize std::default_delete so that scoped_ptr<VideoDecodeAccelerator>
 // uses "Destroy()" instead of trying to use the destructor.
 template <>
-struct MEDIA_EXPORT DefaultDeleter<media::VideoDecodeAccelerator> {
- public:
-  void operator()(void* video_decode_accelerator) const;
+struct MEDIA_EXPORT default_delete<media::VideoDecodeAccelerator> {
+  void operator()(media::VideoDecodeAccelerator* vda) const;
 };
 
-}  // namespace base
+}  // namespace std
 
 #endif  // MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_
diff --git a/media/video/video_encode_accelerator.cc b/media/video/video_encode_accelerator.cc
index dccd31d..51a4a7b 100644
--- a/media/video/video_encode_accelerator.cc
+++ b/media/video/video_encode_accelerator.cc
@@ -19,13 +19,11 @@ VideoEncodeAccelerator::SupportedProfile::~SupportedProfile() {
 
 }  // namespace media
 
-namespace base {
+namespace std {
 
-void DefaultDeleter<media::VideoEncodeAccelerator>::operator()(
-    void* video_encode_accelerator) const {
-  static_cast<media::VideoEncodeAccelerator*>(video_encode_accelerator)->
-      Destroy();
+void default_delete<media::VideoEncodeAccelerator>::operator()(
+    media::VideoEncodeAccelerator* vea) const {
+  vea->Destroy();
 }
 
-}  // namespace base
-
+}  // namespace std
diff --git a/media/video/video_encode_accelerator.h b/media/video/video_encode_accelerator.h
index 6879b0d..39ad0b7 100644
--- a/media/video/video_encode_accelerator.h
+++ b/media/video/video_encode_accelerator.h
@@ -5,6 +5,7 @@
 #ifndef MEDIA_VIDEO_VIDEO_ENCODE_ACCELERATOR_H_
 #define MEDIA_VIDEO_VIDEO_ENCODE_ACCELERATOR_H_
 
+#include <memory>
 #include <vector>
 
 #include "base/basictypes.h"
@@ -155,19 +156,15 @@ class MEDIA_EXPORT VideoEncodeAccelerator {
 
 }  // namespace media
 
-namespace base {
+namespace std {
 
-template <class T>
-struct DefaultDeleter;
-
-// Specialize DefaultDeleter so that scoped_ptr<VideoEncodeAccelerator> always
+// Specialize std::default_delete so that scoped_ptr<VideoEncodeAccelerator>
 // uses "Destroy()" instead of trying to use the destructor.
 template <>
-struct MEDIA_EXPORT DefaultDeleter<media::VideoEncodeAccelerator> {
- public:
-  void operator()(void* video_encode_accelerator) const;
+struct MEDIA_EXPORT default_delete<media::VideoEncodeAccelerator> {
+  void operator()(media::VideoEncodeAccelerator* vea) const;
 };
 
-}  // namespace base
+}  // namespace std
 
 #endif  // MEDIA_VIDEO_VIDEO_ENCODE_ACCELERATOR_H_