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

Unified Diff: media/filters/ffmpeg_demuxer_unittest.cc

Issue 1904213003: Convert //media/filters 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
Index: media/filters/ffmpeg_demuxer_unittest.cc
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index 01f57a11286e375a3954d1768331154796951195..2da7192856450cb3da29eece84af7a76c684bb1a 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -208,7 +208,7 @@ class FFmpegDemuxerTest : public testing::Test {
void(EmeInitDataType init_data_type,
const std::vector<uint8_t>& init_data));
- void OnMediaTracksUpdated(scoped_ptr<MediaTracks> tracks) {
+ void OnMediaTracksUpdated(std::unique_ptr<MediaTracks> tracks) {
CHECK(tracks.get());
media_tracks_ = std::move(tracks);
}
@@ -225,10 +225,10 @@ class FFmpegDemuxerTest : public testing::Test {
}
// Fixture members.
- scoped_ptr<FileDataSource> data_source_;
- scoped_ptr<FFmpegDemuxer> demuxer_;
+ std::unique_ptr<FileDataSource> data_source_;
+ std::unique_ptr<FFmpegDemuxer> demuxer_;
StrictMock<MockDemuxerHost> host_;
- scoped_ptr<MediaTracks> media_tracks_;
+ std::unique_ptr<MediaTracks> media_tracks_;
base::MessageLoop message_loop_;
AVFormatContext* format_context() {

Powered by Google App Engine
This is Rietveld 408576698