Separate DemuxerStream and VideoDecoder.

media/filters/fake_video_decoder.h

Index: media/filters/fake_video_decoder.h
diff --git a/media/filters/fake_video_decoder.h b/media/filters/fake_video_decoder.h
index c82679cbf78bc3998b5a309aea47f6d83b08bf31..2c408e1bcc23b16954fa5d52968c3b0cc80dd2fe 100644
--- a/media/filters/fake_video_decoder.h
+++ b/media/filters/fake_video_decoder.h
@@ -13,7 +13,6 @@
 #include "base/memory/weak_ptr.h"
 #include "media/base/callback_holder.h"
 #include "media/base/decoder_buffer.h"
-#include "media/base/demuxer_stream.h"
 #include "media/base/media_export.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/video_decoder.h"
@@ -36,10 +35,11 @@ class MEDIA_EXPORT FakeVideoDecoder : public VideoDecoder {
   virtual ~FakeVideoDecoder();
 
   // VideoDecoder implementation.
-  virtual void Initialize(DemuxerStream* stream,
+  virtual void Initialize(const VideoDecoderConfig& config,
                           const PipelineStatusCB& status_cb,
                           const StatisticsCB& statistics_cb) OVERRIDE;
-  virtual void Read(const ReadCB& read_cb) OVERRIDE;
+  virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer,
+                      const ReadCB& read_cb) OVERRIDE;
   virtual void Reset(const base::Closure& closure) OVERRIDE;
   virtual void Stop(const base::Closure& closure) OVERRIDE;
 
@@ -62,12 +62,6 @@ class MEDIA_EXPORT FakeVideoDecoder : public VideoDecoder {
     NORMAL
   };
 
-  void ReadFromDemuxerStream();
-
-  // Callback for DemuxerStream::Read().
-  void BufferReady(DemuxerStream::Status status,
-                   const scoped_refptr<DecoderBuffer>& buffer);
-
   void DoReset();
   void DoStop();
 
@@ -86,9 +80,6 @@ class MEDIA_EXPORT FakeVideoDecoder : public VideoDecoder {
   CallbackHolder<base::Closure> reset_cb_;
   CallbackHolder<base::Closure> stop_cb_;
 
-  // Pointer to the demuxer stream that will feed us compressed buffers.
-  DemuxerStream* demuxer_stream_;
-
   VideoDecoderConfig current_config_;
 
   std::list<scoped_refptr<VideoFrame> > decoded_frames_;