Fold Pipeline::Init() into Pipeline::Start().

Instead of having clients optionally call Init() (i.e., player_x11, player_wtl) they are forced to pass null callbacks into Start().

Review URL: https://chromiumcodereview.appspot.com/9269022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119723 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 11 insertions, 2 deletions

diff --git a/media/tools/player_wtl/movie.cc b/media/tools/player_wtl/movie.cc
index fcecd5f..4e44cfc 100644
--- a/media/tools/player_wtl/movie.cc
+++ b/media/tools/player_wtl/movie.cc
@@ -96,7 +96,13 @@ bool Movie::Open(const wchar_t* url, VideoRendererBase* video_renderer) {
 
   // Create and start our pipeline.
   media::PipelineStatusNotification note;
-  pipeline_->Start(collection.Pass(), url_utf8, note.Callback());
+  pipeline_->Start(
+      collection.Pass(),
+      url_utf8,
+      media::PipelineStatusCB(),
+      media::PipelineStatusCB(),
+      media::NetworkEventCB(),
+      note.Callback());
 
   // Wait until the pipeline is fully initialized.
   note.Wait();
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index ef4f126..a90ede5 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -142,7 +142,10 @@ bool InitPipeline(MessageLoop* message_loop,
   // Create the pipeline and start it.
   *pipeline = new media::Pipeline(message_loop, new media::MediaLog());
   media::PipelineStatusNotification note;
-  (*pipeline)->Start(collection.Pass(), filename, note.Callback());
+  (*pipeline)->Start(
+      collection.Pass(), filename, media::PipelineStatusCB(),
+      media::PipelineStatusCB(), media::NetworkEventCB(),
+      note.Callback());
 
   // Wait until the pipeline is fully initialized.
   note.Wait();