Convert scoped_ptr_malloc -> scoped_ptr, part 5.

scoped_ptr_malloc is deprecated; let's get rid of it.

This takes care of the remaining conversions in media/. scoped_ptr requires a
declaration of the deleter, unlike scoped_ptr_malloc, so declarations (minus the
definitions) are in (the new) media/ffmpeg/ffmpeg_deleters.h. (The inline
definitions remain in ffmpeg_common.h.)

BUG=344245
R=dalecurtis@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257532 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 9 deletions

diff --git a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.h b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.h
index 518022c..e32b227 100644
--- a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.h
+++ b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.h
@@ -12,6 +12,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h"
+#include "media/ffmpeg/ffmpeg_deleters.h"
 
 struct AVCodecContext;
 struct AVFrame;
@@ -19,8 +20,6 @@ struct AVFrame;
 namespace media {
 class AudioBus;
 class AudioTimestampHelper;
-class ScopedPtrAVFreeContext;
-class ScopedPtrAVFreeFrame;
 }
 
 namespace media {
@@ -64,8 +63,8 @@ class FFmpegCdmAudioDecoder {
   ClearKeyCdmHost* const host_;
 
   // FFmpeg structures owned by this object.
-  scoped_ptr_malloc<AVCodecContext, ScopedPtrAVFreeContext> codec_context_;
-  scoped_ptr_malloc<AVFrame, ScopedPtrAVFreeFrame> av_frame_;
+  scoped_ptr<AVCodecContext, ScopedPtrAVFreeContext> codec_context_;
+  scoped_ptr<AVFrame, ScopedPtrAVFreeFrame> av_frame_;
 
   // Audio format.
   int samples_per_second_;
diff --git a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h
index 3e30029..446fb28 100644
--- a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h
+++ b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h
@@ -10,15 +10,13 @@
 #include "base/memory/scoped_ptr.h"
 #include "media/cdm/ppapi/external_clear_key/cdm_video_decoder.h"
 #include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h"
+#include "media/ffmpeg/ffmpeg_deleters.h"
 
 struct AVCodecContext;
 struct AVFrame;
 
 namespace media {
 
-class ScopedPtrAVFreeContext;
-class ScopedPtrAVFreeFrame;
-
 class FFmpegCdmVideoDecoder : public CdmVideoDecoder {
  public:
   explicit FFmpegCdmVideoDecoder(ClearKeyCdmHost* host);
@@ -47,8 +45,8 @@ class FFmpegCdmVideoDecoder : public CdmVideoDecoder {
   void ReleaseFFmpegResources();
 
   // FFmpeg structures owned by this object.
-  scoped_ptr_malloc<AVCodecContext, ScopedPtrAVFreeContext> codec_context_;
-  scoped_ptr_malloc<AVFrame, ScopedPtrAVFreeFrame> av_frame_;
+  scoped_ptr<AVCodecContext, ScopedPtrAVFreeContext> codec_context_;
+  scoped_ptr<AVFrame, ScopedPtrAVFreeFrame> av_frame_;
 
   bool is_initialized_;