MediaResource refactoring to support multiple streams

media/base/mock_filters.h

Index: media/base/mock_filters.h
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
index 42345e54fd6013001e5df1ddc09fa9f6375f8877..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_;
@@ -285,7 +286,7 @@ class MockRenderer : public Renderer {
 
   // Renderer implementation.
   MOCK_METHOD3(Initialize,
-               void(DemuxerStreamProvider* demuxer_stream_provider,
+               void(MediaResource* media_resource,
                     RendererClient* client,
                     const PipelineStatusCB& init_cb));
   MOCK_METHOD1(Flush, void(const base::Closure& flush_cb));