Move Liveness from DemuxerStreamProvider to DemuxerStream.

media/filters/renderer_impl_unittest.cc

Index: media/filters/renderer_impl_unittest.cc
diff --git a/media/filters/renderer_impl_unittest.cc b/media/filters/renderer_impl_unittest.cc
index 5db62055e94af33a270f87e693e86688153f067a..c3259db0303d05d31657032767b55b72c247ce94 100644
--- a/media/filters/renderer_impl_unittest.cc
+++ b/media/filters/renderer_impl_unittest.cc
@@ -67,8 +67,6 @@ class RendererImplTest : public ::testing::Test {
     DemuxerStream* null_pointer = NULL;
     EXPECT_CALL(*demuxer_, GetStream(_))
         .WillRepeatedly(Return(null_pointer));
-    EXPECT_CALL(*demuxer_, GetLiveness())
-        .WillRepeatedly(Return(Demuxer::LIVENESS_UNKNOWN));
   }
 
   virtual ~RendererImplTest() {
@@ -99,10 +97,10 @@ class RendererImplTest : public ::testing::Test {
   // Sets up expectations to allow the video renderer to initialize.
   void SetVideoRendererInitializeExpectations(PipelineStatus status) {
     EXPECT_CALL(*video_renderer_,
-                Initialize(video_stream_.get(), _, _, _, _, _, _, _))
-        .WillOnce(DoAll(SaveArg<4>(&video_buffering_state_cb_),
-                        SaveArg<5>(&video_ended_cb_),
-                        RunCallback<2>(status)));
+                Initialize(video_stream_.get(), _, _, _, _, _, _))
+        .WillOnce(DoAll(SaveArg<3>(&video_buffering_state_cb_),
+                        SaveArg<4>(&video_ended_cb_),
+                        RunCallback<1>(status)));
   }
 
   void InitializeAndExpect(PipelineStatus start_status) {