| Index: media/filters/audio_decoder_unittest.cc
|
| diff --git a/media/filters/audio_decoder_unittest.cc b/media/filters/audio_decoder_unittest.cc
|
| index ec19b80f40d4b148274bf12ffcaae105b74226dd..76ce8ec444b8d1b7590c94391bfe006b94218fae 100644
|
| --- a/media/filters/audio_decoder_unittest.cc
|
| +++ b/media/filters/audio_decoder_unittest.cc
|
| @@ -296,7 +296,7 @@ class AudioDecoderTest : public testing::TestWithParam<DecoderTestData> {
|
| CHECK_LT(i, decoded_audio_.size());
|
| const scoped_refptr<AudioBuffer>& buffer = decoded_audio_[i];
|
|
|
| - scoped_ptr<AudioBus> output =
|
| + std::unique_ptr<AudioBus> output =
|
| AudioBus::Create(buffer->channel_count(), buffer->frame_count());
|
| buffer->ReadFrames(buffer->frame_count(), 0, 0, output.get());
|
|
|
| @@ -338,7 +338,7 @@ class AudioDecoderTest : public testing::TestWithParam<DecoderTestData> {
|
| EXPECT_EQ(sample_info.duration, buffer->duration().InMicroseconds());
|
| EXPECT_FALSE(buffer->end_of_stream());
|
|
|
| - scoped_ptr<AudioBus> output =
|
| + std::unique_ptr<AudioBus> output =
|
| AudioBus::Create(buffer->channel_count(), buffer->frame_count());
|
| buffer->ReadFrames(buffer->frame_count(), 0, 0, output.get());
|
|
|
| @@ -369,10 +369,10 @@ class AudioDecoderTest : public testing::TestWithParam<DecoderTestData> {
|
| private:
|
| base::MessageLoop message_loop_;
|
| scoped_refptr<DecoderBuffer> data_;
|
| - scoped_ptr<InMemoryUrlProtocol> protocol_;
|
| - scoped_ptr<AudioFileReader> reader_;
|
| + std::unique_ptr<InMemoryUrlProtocol> protocol_;
|
| + std::unique_ptr<AudioFileReader> reader_;
|
|
|
| - scoped_ptr<AudioDecoder> decoder_;
|
| + std::unique_ptr<AudioDecoder> decoder_;
|
| bool pending_decode_;
|
| bool pending_reset_;
|
| DecodeStatus last_decode_status_;
|
|
|