Separate DemuxerStream and VideoDecoder.

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 5522681942155f502b00c19994324c152de95435..e3354779718e76bb68f16db5801a383e2c2c7a3f 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -44,7 +44,7 @@ class MockDemuxer : public Demuxer {
 
 class MockDemuxerStream : public DemuxerStream {
  public:
-  MockDemuxerStream(DemuxerStream::Type type);
+  explicit MockDemuxerStream(DemuxerStream::Type type);
   virtual ~MockDemuxerStream();
 
   // DemuxerStream implementation.
@@ -71,10 +71,11 @@ class MockVideoDecoder : public VideoDecoder {
   virtual ~MockVideoDecoder();
 
   // VideoDecoder implementation.
-  MOCK_METHOD3(Initialize, void(DemuxerStream*,
+  MOCK_METHOD3(Initialize, void(const VideoDecoderConfig& config,
                                 const PipelineStatusCB&,
                                 const StatisticsCB&));
-  MOCK_METHOD1(Read, void(const ReadCB&));
+  MOCK_METHOD2(Decode, void(const scoped_refptr<DecoderBuffer>& buffer,
+                            const ReadCB&));
   MOCK_METHOD1(Reset, void(const base::Closure&));
   MOCK_METHOD1(Stop, void(const base::Closure&));
   MOCK_CONST_METHOD0(HasAlpha, bool());