summaryrefslogtreecommitdiff
path: root/chromium/media/base/mock_filters.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/media/base/mock_filters.cc')
-rw-r--r--chromium/media/base/mock_filters.cc27
1 files changed, 26 insertions, 1 deletions
diff --git a/chromium/media/base/mock_filters.cc b/chromium/media/base/mock_filters.cc
index 98c23be9bf0..1c783bd55f0 100644
--- a/chromium/media/base/mock_filters.cc
+++ b/chromium/media/base/mock_filters.cc
@@ -14,6 +14,31 @@ using ::testing::Return;
namespace media {
+MockPipeline::MockPipeline() {}
+
+MockPipeline::~MockPipeline() {}
+
+void MockPipeline::Start(Demuxer* demuxer,
+ scoped_ptr<Renderer> renderer,
+ const base::Closure& ended_cb,
+ const PipelineStatusCB& error_cb,
+ const PipelineStatusCB& seek_cb,
+ const PipelineMetadataCB& metadata_cb,
+ const BufferingStateCB& buffering_state_cb,
+ const base::Closure& duration_change_cb,
+ const AddTextTrackCB& add_text_track_cb,
+ const base::Closure& waiting_for_decryption_key_cb) {
+ Start(demuxer, &renderer, ended_cb, error_cb, seek_cb, metadata_cb,
+ buffering_state_cb, duration_change_cb, add_text_track_cb,
+ waiting_for_decryption_key_cb);
+}
+
+void MockPipeline::Resume(scoped_ptr<Renderer> renderer,
+ base::TimeDelta timestamp,
+ const PipelineStatusCB& seek_cb) {
+ Resume(&renderer, timestamp, seek_cb);
+}
+
MockDemuxer::MockDemuxer() {}
MockDemuxer::~MockDemuxer() {}
@@ -71,7 +96,7 @@ std::string MockVideoDecoder::GetDisplayName() const {
}
MockVideoDecoder::MockVideoDecoder() {
- EXPECT_CALL(*this, HasAlpha()).WillRepeatedly(Return(false));
+ ON_CALL(*this, CanReadWithoutStalling()).WillByDefault(Return(true));
}
std::string MockAudioDecoder::GetDisplayName() const {