Chromium Code Reviews| Index: media/filters/ffmpeg_demuxer_unittest.cc |
| diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc |
| index 11bcbb3a72d318ba05f5bf0243dbb7252070805f..44b72e3e5d7d752c55e42cf173cb0c4853fc670d 100644 |
| --- a/media/filters/ffmpeg_demuxer_unittest.cc |
| +++ b/media/filters/ffmpeg_demuxer_unittest.cc |
| @@ -18,6 +18,7 @@ |
| #include "base/run_loop.h" |
| #include "base/single_thread_task_runner.h" |
| #include "base/test/mock_callback.h" |
| +#include "base/test/scoped_task_scheduler.h" |
| #include "base/threading/thread.h" |
| #include "base/threading/thread_task_runner_handle.h" |
| #include "media/base/decrypt_config.h" |
| @@ -80,7 +81,7 @@ static void EosOnReadDone(bool* got_eos_buffer, |
| // FFmpeg, pipeline and filter host mocks. |
| class FFmpegDemuxerTest : public testing::Test { |
| protected: |
| - FFmpegDemuxerTest() {} |
| + FFmpegDemuxerTest() : task_scheduler_(&message_loop_) {} |
| virtual ~FFmpegDemuxerTest() { |
| if (demuxer_) |
| @@ -239,11 +240,13 @@ class FFmpegDemuxerTest : public testing::Test { |
| } |
| // Fixture members. |
| + |
| + base::MessageLoop message_loop_; |
|
gab
2017/02/24 01:09:05
Drop this member (ScopedTaskScheduler will provide
DaleCurtis
2017/02/24 23:40:29
Done.
|
| + base::test::ScopedTaskScheduler task_scheduler_; |
| std::unique_ptr<FileDataSource> data_source_; |
| std::unique_ptr<FFmpegDemuxer> demuxer_; |
| StrictMock<MockDemuxerHost> host_; |
| std::unique_ptr<MediaTracks> media_tracks_; |
| - base::MessageLoop message_loop_; |
| AVFormatContext* format_context() { |
| return demuxer_->glue_->format_context(); |