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

Unified Diff: media/filters/ffmpeg_demuxer_unittest.cc

Issue 2710133003: Replace FFmpegDemuxer thread per element with base::TaskScheduler. (Closed)
Patch Set: Give WeakPtr to URLProtocol. Created 3 years, 10 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 92766f1cdcfe4db048b6ddf9dc73998d72feb60d..d0a7d1a2565d94d598310d1952984f73171272b7 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"
@@ -85,6 +86,8 @@ class FFmpegDemuxerTest : public testing::Test {
virtual ~FFmpegDemuxerTest() {
if (demuxer_)
demuxer_->Stop();
+ demuxer_.reset();
+ base::RunLoop().RunUntilIdle();
}
void CreateDemuxer(const std::string& name) {
@@ -101,7 +104,7 @@ class FFmpegDemuxerTest : public testing::Test {
&FFmpegDemuxerTest::OnMediaTracksUpdated, base::Unretained(this));
demuxer_.reset(new FFmpegDemuxer(
- message_loop_.task_runner(), data_source_.get(),
+ base::ThreadTaskRunnerHandle::Get(), data_source_.get(),
encrypted_media_init_data_cb, tracks_updated_cb, new MediaLog()));
}
@@ -188,9 +191,8 @@ class FFmpegDemuxerTest : public testing::Test {
buffer->discard_padding().first);
EXPECT_EQ(read_expectation.is_key_frame, buffer->is_key_frame());
}
- DCHECK_EQ(&message_loop_, base::MessageLoop::current());
OnReadDoneCalled(read_expectation.size, read_expectation.timestamp_us);
- message_loop_.task_runner()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
}
@@ -239,11 +241,12 @@ class FFmpegDemuxerTest : public testing::Test {
}
// Fixture members.
+
+ 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();

Powered by Google App Engine
This is Rietveld 408576698