Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(379)

Unified Diff: media/cast/test/fake_media_source.h

Issue 1905763002: Convert //media/cast from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cast/test/end2end_unittest.cc ('k') | media/cast/test/fake_media_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/test/fake_media_source.h
diff --git a/media/cast/test/fake_media_source.h b/media/cast/test/fake_media_source.h
index 7c4d456420ce7929d23de147e9992a087b000d78..b899188827e4f8200c6c6e201424fd5241c4d79a 100644
--- a/media/cast/test/fake_media_source.h
+++ b/media/cast/test/fake_media_source.h
@@ -134,11 +134,11 @@ class FakeMediaSource : public media::AudioConverter::InputCallback {
// The following three members are used only for fake frames.
int audio_frame_count_; // Each audio frame is exactly 10ms.
int video_frame_count_;
- scoped_ptr<TestAudioBusFactory> audio_bus_factory_;
+ std::unique_ptr<TestAudioBusFactory> audio_bus_factory_;
base::MemoryMappedFile file_data_;
- scoped_ptr<InMemoryUrlProtocol> protocol_;
- scoped_ptr<FFmpegGlue> glue_;
+ std::unique_ptr<InMemoryUrlProtocol> protocol_;
+ std::unique_ptr<FFmpegGlue> glue_;
AVFormatContext* av_format_context_;
int audio_stream_index_;
@@ -150,13 +150,13 @@ class FakeMediaSource : public media::AudioConverter::InputCallback {
int video_frame_rate_denominator_;
// These are used for audio resampling.
- scoped_ptr<media::AudioConverter> audio_converter_;
- scoped_ptr<media::AudioFifo> audio_fifo_;
- scoped_ptr<media::AudioBus> audio_fifo_input_bus_;
+ std::unique_ptr<media::AudioConverter> audio_converter_;
+ std::unique_ptr<media::AudioFifo> audio_fifo_;
+ std::unique_ptr<media::AudioBus> audio_fifo_input_bus_;
media::AudioRendererAlgorithm audio_algo_;
// Track the timestamp of audio sent to the receiver.
- scoped_ptr<media::AudioTimestampHelper> audio_sent_ts_;
+ std::unique_ptr<media::AudioTimestampHelper> audio_sent_ts_;
std::queue<scoped_refptr<VideoFrame> > video_frame_queue_;
std::queue<scoped_refptr<VideoFrame> > inserted_video_frame_queue_;
« no previous file with comments | « media/cast/test/end2end_unittest.cc ('k') | media/cast/test/fake_media_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698