| Index: media/video/video_decode_accelerator.h
|
| diff --git a/media/video/video_decode_accelerator.h b/media/video/video_decode_accelerator.h
|
| index a53e352b59d315d590dca759fc079a43bc0afbbc..e2bcdf64855fdf3455fc0a3b73ae2b59c2e928e6 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_
|
|
|