Separate DemuxerStream and VideoDecoder.

media/filters/video_renderer_base_unittest.cc

Index: media/filters/video_renderer_base_unittest.cc
diff --git a/media/filters/video_renderer_base_unittest.cc b/media/filters/video_renderer_base_unittest.cc
index 518f1590af180658ddae227f19fb7731f725e6d3..31ccbe6ace36bb7df0aac5190613a7405ef4834a 100644
--- a/media/filters/video_renderer_base_unittest.cc
+++ b/media/filters/video_renderer_base_unittest.cc
@@ -24,6 +24,7 @@ using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::InSequence;
 using ::testing::Invoke;
+using ::testing::NiceMock;
 using ::testing::NotNull;
 using ::testing::Return;
 using ::testing::StrictMock;
@@ -52,6 +53,9 @@ class VideoRendererBaseTest : public ::testing::Test {
     demuxer_stream_.set_video_decoder_config(TestVideoConfig::Normal());
 
     // We expect these to be called but we don't care how/when.
+    EXPECT_CALL(demuxer_stream_, Read(_))
+        .WillRepeatedly(RunCallback<0>(DemuxerStream::kOk,
+                                       DecoderBuffer::CreateEOSBuffer()));
     EXPECT_CALL(*decoder_, Stop(_))
         .WillRepeatedly(Invoke(this, &VideoRendererBaseTest::StopRequested));
     EXPECT_CALL(statistics_cb_object_, OnStatistics(_))
@@ -78,8 +82,8 @@ class VideoRendererBaseTest : public ::testing::Test {
   void InitializeWithDuration(int duration_ms) {
     duration_ = base::TimeDelta::FromMilliseconds(duration_ms);
 
-    // Monitor reads from the decoder.
-    EXPECT_CALL(*decoder_, Read(_))
+    // Monitor decodes from the decoder.
+    EXPECT_CALL(*decoder_, Decode(_, _))
         .WillRepeatedly(Invoke(this, &VideoRendererBaseTest::FrameRequested));
 
     EXPECT_CALL(*decoder_, Reset(_))
@@ -289,7 +293,7 @@ class VideoRendererBaseTest : public ::testing::Test {
   // Fixture members.
   scoped_ptr<VideoRendererBase> renderer_;
   MockVideoDecoder* decoder_;  // Owned by |renderer_|.
-  MockDemuxerStream demuxer_stream_;
+  NiceMock<MockDemuxerStream> demuxer_stream_;
   MockStatisticsCB statistics_cb_object_;
 
  private:
@@ -307,7 +311,8 @@ class VideoRendererBaseTest : public ::testing::Test {
     current_frame_ = frame;
   }
 
-  void FrameRequested(const VideoDecoder::ReadCB& read_cb) {
+  void FrameRequested(const scoped_refptr<DecoderBuffer>& buffer,
+                      const VideoDecoder::ReadCB& read_cb) {
     DCHECK_EQ(&message_loop_, base::MessageLoop::current());
     CHECK(read_cb_.is_null());
     read_cb_ = read_cb;