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

Unified Diff: media/filters/decoder_base_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/decoder_base.h ('k') | media/filters/ffmpeg_audio_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/decoder_base_unittest.cc
diff --git a/media/filters/decoder_base_unittest.cc b/media/filters/decoder_base_unittest.cc
index e4cec5d024abcf8253cdc8dfd571805c4531f0f7..b5bff876838807998ebe24e0498b86c2adbe7684 100644
--- a/media/filters/decoder_base_unittest.cc
+++ b/media/filters/decoder_base_unittest.cc
@@ -61,7 +61,8 @@ class MockDecoderCallback {
class MockDecoderImpl : public media::DecoderBase<
MockDecoder, MockDecoderOutput> {
public:
- MockDecoderImpl() {
+ explicit MockDecoderImpl(MessageLoop* message_loop)
+ : media::DecoderBase<MockDecoder, MockDecoderOutput>(message_loop) {
media_format_.SetAsString(media::MediaFormat::kMimeType, "mock");
}
@@ -116,13 +117,12 @@ ACTION(CompleteDemuxRequest) {
// \ ReadCallback() -> client
TEST(DecoderBaseTest, FlowControl) {
MessageLoop message_loop;
- scoped_refptr<MockDecoderImpl> decoder(new MockDecoderImpl());
+ scoped_refptr<MockDecoderImpl> decoder(new MockDecoderImpl(&message_loop));
MockDecoderCallback read_callback;
decoder->set_consume_audio_samples_callback(
NewCallback(&read_callback, &MockDecoderCallback::OnReadComplete));
scoped_refptr<MockDemuxerStream> demuxer_stream(new MockDemuxerStream());
StrictMock<MockFilterCallback> callback;
- decoder->set_message_loop(&message_loop);
// Initailize.
EXPECT_CALL(callback, OnFilterCallback());
« no previous file with comments | « media/filters/decoder_base.h ('k') | media/filters/ffmpeg_audio_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698