Index: media/cast/test/fake_media_source.cc |
diff --git a/media/cast/test/fake_media_source.cc b/media/cast/test/fake_media_source.cc |
index 7d58a4c391c093a604860f45c6fe780cf274c35f..9bd792cdbf2be19043cf1abf4b0065ebda365deb 100644 |
--- a/media/cast/test/fake_media_source.cc |
+++ b/media/cast/test/fake_media_source.cc |
@@ -283,7 +283,7 @@ void FakeMediaSource::SendNextFakeFrame() { |
if (is_transcoding_audio()) { |
Decode(true); |
CHECK(!audio_bus_queue_.empty()) << "No audio decoded."; |
- scoped_ptr<AudioBus> bus(audio_bus_queue_.front()); |
+ std::unique_ptr<AudioBus> bus(audio_bus_queue_.front()); |
audio_bus_queue_.pop(); |
audio_frame_input_->InsertAudio(std::move(bus), start_time_ + audio_time); |
} else { |
@@ -374,7 +374,7 @@ bool FakeMediaSource::SendNextTranscodedAudio(base::TimeDelta elapsed_time) { |
base::TimeDelta audio_time = audio_sent_ts_->GetTimestamp(); |
if (elapsed_time < audio_time) |
return false; |
- scoped_ptr<AudioBus> bus(audio_bus_queue_.front()); |
+ std::unique_ptr<AudioBus> bus(audio_bus_queue_.front()); |
audio_bus_queue_.pop(); |
audio_sent_ts_->AddFrames(bus->frames()); |
audio_frame_input_->InsertAudio(std::move(bus), start_time_ + audio_time); |
@@ -519,10 +519,9 @@ void FakeMediaSource::DecodeAudio(ScopedAVPacket packet) { |
continue; |
} |
- scoped_ptr<media::AudioBus> resampled_bus( |
- media::AudioBus::Create( |
- output_audio_params_.channels(), |
- output_audio_params_.sample_rate() / kAudioPacketsPerSecond)); |
+ std::unique_ptr<media::AudioBus> resampled_bus(media::AudioBus::Create( |
+ output_audio_params_.channels(), |
+ output_audio_params_.sample_rate() / kAudioPacketsPerSecond)); |
audio_converter_->Convert(resampled_bus.get()); |
audio_bus_queue_.push(resampled_bus.release()); |
} |