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

Unified Diff: media/base/mock_filters.h

Issue 2667283002: Refactor MediaResource to be multi-stream capable (Closed)
Patch Set: Created 3 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/base/media_url_demuxer.cc ('k') | media/base/pipeline_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/mock_filters.h
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
index aaf6c6a53b94320d5312c575ce6f18a9d815111f..4b5d6e600143b686122abe20c812a3afed894393 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -132,7 +132,9 @@ class MockDemuxer : public Demuxer {
MOCK_METHOD2(Seek, void(base::TimeDelta time, const PipelineStatusCB& cb));
MOCK_METHOD0(Stop, void());
MOCK_METHOD0(AbortPendingReads, void());
- MOCK_METHOD1(GetStream, DemuxerStream*(DemuxerStream::Type));
+ MOCK_METHOD0(GetStreams, std::vector<DemuxerStream*>());
+ MOCK_METHOD1(SetStreamStatusChangeCB, void(const StreamStatusChangeCB& cb));
+
MOCK_CONST_METHOD0(GetStartTime, base::TimeDelta());
MOCK_CONST_METHOD0(GetTimelineOffset, base::Time());
MOCK_CONST_METHOD0(GetMemoryUsage, int64_t());
@@ -166,7 +168,6 @@ class MockDemuxerStream : public DemuxerStream {
VideoRotation video_rotation() override;
MOCK_CONST_METHOD0(enabled, bool());
MOCK_METHOD2(set_enabled, void(bool, base::TimeDelta));
- MOCK_METHOD1(SetStreamStatusChangeCB, void(const StreamStatusChangeCB&));
private:
Type type_;
« no previous file with comments | « media/base/media_url_demuxer.cc ('k') | media/base/pipeline_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698