Index: media/filters/android/media_codec_audio_decoder.cc |
diff --git a/media/filters/android/media_codec_audio_decoder.cc b/media/filters/android/media_codec_audio_decoder.cc |
index c3bca6a7cee874e0e1bd32dbababa53a3c028736..6a3a8bb286b270fc0037304da7e0e917c7961b86 100644 |
--- a/media/filters/android/media_codec_audio_decoder.cc |
+++ b/media/filters/android/media_codec_audio_decoder.cc |
@@ -41,11 +41,12 @@ inline int GetChannelCount(const AudioDecoderConfig& config) { |
return ChannelLayoutToChannelCount(config.channel_layout()); |
} |
-scoped_ptr<MediaCodecBridge> CreateMediaCodec(const AudioDecoderConfig& config, |
- jobject media_crypto) { |
+std::unique_ptr<MediaCodecBridge> CreateMediaCodec( |
+ const AudioDecoderConfig& config, |
+ jobject media_crypto) { |
DVLOG(1) << __FUNCTION__ << ": config:" << config.AsHumanReadableString(); |
- scoped_ptr<AudioCodecBridge> audio_codec_bridge( |
+ std::unique_ptr<AudioCodecBridge> audio_codec_bridge( |
AudioCodecBridge::Create(config.codec())); |
if (!audio_codec_bridge) { |
DVLOG(0) << __FUNCTION__ << " failed: cannot create AudioCodecBridge"; |