| Index: media/filters/android/media_codec_audio_decoder.h
|
| diff --git a/media/filters/android/media_codec_audio_decoder.h b/media/filters/android/media_codec_audio_decoder.h
|
| index 3e68ba4e2d0e148401c73bdf07af103f904bbad3..642ea32a3c901161b09b692026612f4d448632e7 100644
|
| --- a/media/filters/android/media_codec_audio_decoder.h
|
| +++ b/media/filters/android/media_codec_audio_decoder.h
|
| @@ -6,10 +6,10 @@
|
| #define MEDIA_FILTERS_ANDROID_MEDIA_CODEC_AUDIO_DECODER_H_
|
|
|
| #include <deque>
|
| +#include <memory>
|
| #include <utility>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/time/time.h"
|
| #include "base/timer/timer.h"
|
| @@ -240,9 +240,9 @@ class MEDIA_EXPORT MediaCodecAudioDecoder : public AudioDecoder {
|
| // Callback that delivers output frames.
|
| OutputCB output_cb_;
|
|
|
| - scoped_ptr<MediaCodecBridge> media_codec_;
|
| + std::unique_ptr<MediaCodecBridge> media_codec_;
|
|
|
| - scoped_ptr<AudioTimestampHelper> timestamp_helper_;
|
| + std::unique_ptr<AudioTimestampHelper> timestamp_helper_;
|
|
|
| // Repeating timer that kicks MediaCodec operation.
|
| base::RepeatingTimer io_timer_;
|
|
|