media: Pass DemuxerStreamProvider in Renderer::Initialize().

media/base/pipeline_unittest.cc

Index: media/base/pipeline_unittest.cc
diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc
index 7b29698c3b7311e7ca08ec391cbeab3dd4e80565..5a7e20df434f82d9e1897c62549d94a99a7db34b 100644
--- a/media/base/pipeline_unittest.cc
+++ b/media/base/pipeline_unittest.cc
@@ -165,10 +165,10 @@ class PipelineTest : public ::testing::Test {
 
   // Sets up expectations to allow the video renderer to initialize.
   void SetRendererExpectations() {
-    EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _))
-        .WillOnce(DoAll(SaveArg<2>(&ended_cb_),
-                        SaveArg<4>(&buffering_state_cb_),
-                        RunCallback<0>()));
+    EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _, _))
+        .WillOnce(DoAll(SaveArg<3>(&ended_cb_),
+                        SaveArg<5>(&buffering_state_cb_),
+                        RunCallback<1>()));
     EXPECT_CALL(*renderer_, HasAudio()).WillRepeatedly(Return(audio_stream()));
     EXPECT_CALL(*renderer_, HasVideo()).WillRepeatedly(Return(video_stream()));
   }
@@ -847,23 +847,23 @@ class PipelineTeardownTest : public PipelineTest {
 
     if (state == kInitRenderer) {
       if (stop_or_error == kStop) {
-        EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _))
+        EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _, _))
             .WillOnce(DoAll(Stop(pipeline_.get(), stop_cb),
-                            RunCallback<0>()));
+                            RunCallback<1>()));
         ExpectPipelineStopAndDestroyPipeline();
       } else {
         status = PIPELINE_ERROR_INITIALIZATION_FAILED;
-        EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _))
-            .WillOnce(DoAll(RunCallback<3>(status), RunCallback<0>()));
+        EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _, _))
+            .WillOnce(DoAll(RunCallback<4>(status), RunCallback<1>()));
       }
 
       EXPECT_CALL(*demuxer_, Stop());
       return status;
     }
 
-    EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _))
-        .WillOnce(DoAll(SaveArg<4>(&buffering_state_cb_),
-                        RunCallback<0>()));
+    EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _, _))
+        .WillOnce(DoAll(SaveArg<5>(&buffering_state_cb_),
+                        RunCallback<1>()));
 
     EXPECT_CALL(callbacks_, OnMetadata(_));