| Index: media/filters/decoder_stream.cc
|
| diff --git a/media/filters/decoder_stream.cc b/media/filters/decoder_stream.cc
|
| index 19ae054d64e7ab73d786a44d5050bca508ca7390..90d5da2b842b7545b8765e7235d6ce0a555dc0fe 100644
|
| --- a/media/filters/decoder_stream.cc
|
| +++ b/media/filters/decoder_stream.cc
|
| @@ -237,8 +237,8 @@ void DecoderStream<StreamType>::SelectDecoder(CdmContext* cdm_context) {
|
|
|
| template <DemuxerStream::Type StreamType>
|
| void DecoderStream<StreamType>::OnDecoderSelected(
|
| - scoped_ptr<Decoder> selected_decoder,
|
| - scoped_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream) {
|
| + std::unique_ptr<Decoder> selected_decoder,
|
| + std::unique_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream) {
|
| FUNCTION_DVLOG(2) << ": "
|
| << (selected_decoder ? selected_decoder->GetDisplayName()
|
| : "No decoder selected.");
|
|
|