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

Unified Diff: media/filters/ffmpeg_video_decoder_unittest.cc

Issue 6171009: Remove MessageLoop methods from Filter interface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Applied more CR suggestions & removed message_loop() methods where possible. Created 9 years, 11 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/filters/ffmpeg_video_decoder.cc ('k') | media/filters/omx_video_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_video_decoder_unittest.cc
diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc
index 779a48f64e79fb19a66fa3aa72d2dccb22d282b0..5ca896a6afcc866363cbf4da6c3595065384f13b 100644
--- a/media/filters/ffmpeg_video_decoder_unittest.cc
+++ b/media/filters/ffmpeg_video_decoder_unittest.cc
@@ -71,8 +71,9 @@ class MockVideoDecodeEngine : public VideoDecodeEngine {
// Class that just mocks the private functions.
class DecoderPrivateMock : public FFmpegVideoDecoder {
public:
- explicit DecoderPrivateMock(VideoDecodeContext* context)
- : FFmpegVideoDecoder(context) {
+ DecoderPrivateMock(MessageLoop* message_loop,
+ VideoDecodeContext* context)
+ : FFmpegVideoDecoder(message_loop, context) {
}
// change access qualifier for test: used in actions.
@@ -125,7 +126,7 @@ class FFmpegVideoDecoderTest : public testing::Test {
// Create an FFmpegVideoDecoder, and MockVideoDecodeEngine.
//
// TODO(ajwong): Break the test's dependency on FFmpegVideoDecoder.
- decoder_ = new DecoderPrivateMock(NULL);
+ decoder_ = new DecoderPrivateMock(&message_loop_, NULL);
renderer_ = new MockVideoRenderer();
engine_ = new StrictMock<MockVideoDecodeEngine>();
@@ -133,7 +134,6 @@ class FFmpegVideoDecoderTest : public testing::Test {
// Inject mocks and prepare a demuxer stream.
decoder_->set_host(&host_);
- decoder_->set_message_loop(&message_loop_);
decoder_->SetVideoDecodeEngineForTest(engine_);
demuxer_ = new StrictMock<MockFFmpegDemuxerStream>();
« no previous file with comments | « media/filters/ffmpeg_video_decoder.cc ('k') | media/filters/omx_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698