Change PipelineStatusCB to Closure for ended callbacks.

BUG=167109
TEST=All existing unit tests pass

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

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

6 files changed, 15 insertions, 17 deletions

diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc
index fd8b902..cc6419a 100644
--- a/media/base/pipeline.cc
+++ b/media/base/pipeline.cc
@@ -103,7 +103,7 @@ Pipeline::~Pipeline() {
 }
 
 void Pipeline::Start(scoped_ptr<FilterCollection> collection,
-                     const PipelineStatusCB& ended_cb,
+                     const base::Closure& ended_cb,
                      const PipelineStatusCB& error_cb,
                      const PipelineStatusCB& seek_cb,
                      const BufferingStateCB& buffering_state_cb) {
@@ -694,7 +694,7 @@ void Pipeline::OnUpdateStatistics(const PipelineStatistics& stats) {
 }
 
 void Pipeline::StartTask(scoped_ptr<FilterCollection> filter_collection,
-                         const PipelineStatusCB& ended_cb,
+                         const base::Closure& ended_cb,
                          const PipelineStatusCB& error_cb,
                          const PipelineStatusCB& seek_cb,
                          const BufferingStateCB& buffering_state_cb) {
@@ -851,9 +851,8 @@ void Pipeline::RunEndedCallbackIfNeeded() {
     clock_->EndOfStream();
   }
 
-  // TODO(scherkus): Change |ended_cb_| into a Closure.
   DCHECK_EQ(status_, PIPELINE_OK);
-  ended_cb_.Run(status_);
+  ended_cb_.Run();
 }
 
 void Pipeline::AudioDisabledTask() {
diff --git a/media/base/pipeline.h b/media/base/pipeline.h
index 12371b4..25e4dcb 100644
--- a/media/base/pipeline.h
+++ b/media/base/pipeline.h
@@ -130,7 +130,7 @@ class MEDIA_EXPORT Pipeline
   //                    pipeline's buffering state changes.
   // It is an error to call this method after the pipeline has already started.
   void Start(scoped_ptr<FilterCollection> filter_collection,
-             const PipelineStatusCB& ended_cb,
+             const base::Closure& ended_cb,
              const PipelineStatusCB& error_cb,
              const PipelineStatusCB& seek_cb,
              const BufferingStateCB& buffering_state_cb);
@@ -289,7 +289,7 @@ class MEDIA_EXPORT Pipeline
   // methods are run as the result of posting a task to the PipelineInternal's
   // message loop.
   void StartTask(scoped_ptr<FilterCollection> filter_collection,
-                 const PipelineStatusCB& ended_cb,
+                 const base::Closure& ended_cb,
                  const PipelineStatusCB& error_cb,
                  const PipelineStatusCB& seek_cb,
                  const BufferingStateCB& buffering_state_cb);
@@ -445,7 +445,7 @@ class MEDIA_EXPORT Pipeline
   base::Closure stop_cb_;
 
   // Permanent callbacks passed in via Start().
-  PipelineStatusCB ended_cb_;
+  base::Closure ended_cb_;
   PipelineStatusCB error_cb_;
   BufferingStateCB buffering_state_cb_;
 
diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc
index a12f91c..e662622 100644
--- a/media/base/pipeline_unittest.cc
+++ b/media/base/pipeline_unittest.cc
@@ -61,7 +61,7 @@ class CallbackHelper {
   MOCK_METHOD1(OnStart, void(PipelineStatus));
   MOCK_METHOD1(OnSeek, void(PipelineStatus));
   MOCK_METHOD0(OnStop, void());
-  MOCK_METHOD1(OnEnded, void(PipelineStatus));
+  MOCK_METHOD0(OnEnded, void());
   MOCK_METHOD1(OnError, void(PipelineStatus));
   MOCK_METHOD1(OnBufferingState, void(Pipeline::BufferingState));
 
@@ -533,7 +533,7 @@ TEST_F(PipelineTest, DisableAudioRenderer) {
   pipeline_->OnAudioDisabled();
 
   // Verify that ended event is fired when video ends.
-  EXPECT_CALL(callbacks_, OnEnded(PIPELINE_OK));
+  EXPECT_CALL(callbacks_, OnEnded());
   pipeline_->OnVideoRendererEnded();
 }
 
@@ -556,7 +556,7 @@ TEST_F(PipelineTest, DisableAudioRendererDuringInit) {
   EXPECT_TRUE(pipeline_->HasVideo());
 
   // Verify that ended event is fired when video ends.
-  EXPECT_CALL(callbacks_, OnEnded(PIPELINE_OK));
+  EXPECT_CALL(callbacks_, OnEnded());
   pipeline_->OnVideoRendererEnded();
 }
 
@@ -576,7 +576,7 @@ TEST_F(PipelineTest, EndedCallback) {
   pipeline_->OnAudioRendererEnded();
   message_loop_.RunUntilIdle();
 
-  EXPECT_CALL(callbacks_, OnEnded(PIPELINE_OK));
+  EXPECT_CALL(callbacks_, OnEnded());
   pipeline_->OnVideoRendererEnded();
   message_loop_.RunUntilIdle();
 }
@@ -634,7 +634,7 @@ TEST_F(PipelineTest, AudioStreamShorterThanVideo) {
   EXPECT_GT(pipeline_->GetMediaTime().ToInternalValue(), start_time);
 
   // Signal end of video stream and make sure OnEnded() callback occurs.
-  EXPECT_CALL(callbacks_, OnEnded(PIPELINE_OK));
+  EXPECT_CALL(callbacks_, OnEnded());
   pipeline_->OnVideoRendererEnded();
 }
 
diff --git a/media/filters/pipeline_integration_test_base.cc b/media/filters/pipeline_integration_test_base.cc
index 1829e0a..97b1653 100644
--- a/media/filters/pipeline_integration_test_base.cc
+++ b/media/filters/pipeline_integration_test_base.cc
@@ -57,11 +57,10 @@ PipelineStatusCB PipelineIntegrationTestBase::QuitOnStatusCB(
                     expected_status);
 }
 
-void PipelineIntegrationTestBase::OnEnded(PipelineStatus status) {
-  DCHECK_EQ(status, PIPELINE_OK);
+void PipelineIntegrationTestBase::OnEnded() {
   DCHECK(!ended_);
   ended_ = true;
-  pipeline_status_ = status;
+  pipeline_status_ = PIPELINE_OK;
   message_loop_.PostTask(FROM_HERE, MessageLoop::QuitClosure());
 }
 
diff --git a/media/filters/pipeline_integration_test_base.h b/media/filters/pipeline_integration_test_base.h
index bc67e80..dedbb70 100644
--- a/media/filters/pipeline_integration_test_base.h
+++ b/media/filters/pipeline_integration_test_base.h
@@ -81,7 +81,7 @@ class PipelineIntegrationTestBase {
                                PipelineStatus status);
   void OnStatusCallback(PipelineStatus status);
   PipelineStatusCB QuitOnStatusCB(PipelineStatus expected_status);
-  void OnEnded(PipelineStatus status);
+  void OnEnded();
   void OnError(PipelineStatus status);
   void QuitAfterCurrentTimeTask(const base::TimeDelta& quit_time);
   scoped_ptr<FilterCollection> CreateFilterCollection(
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index 0a7477c..e6f05bf 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -132,7 +132,7 @@ bool InitPipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop,
   *pipeline = new media::Pipeline(message_loop, new media::MediaLog());
   media::PipelineStatusNotification note;
   (*pipeline)->Start(
-      collection.Pass(), media::PipelineStatusCB(), media::PipelineStatusCB(),
+      collection.Pass(), base::Closure(), media::PipelineStatusCB(),
       note.Callback(), base::Bind(&OnBufferingState));
 
   // Wait until the pipeline is fully initialized.