[Code Health] Replace more PipelineStatusCB in media/base

This replaces PipelineStatusCB with PipelineStatusCallback in the last
places except for error_cb_, which seems like it can be called more
than once in a test.

Bug: 1007799
Change-Id: Ib60a01634267ea4f5313b8ac8f495925a6f3d989
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1993423Reviewed-by: Chrome Cunningham <chcunningham@chromium.org>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Commit-Queue: Raymond Toy <rtoy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748348}

media/base/test_helpers.cc

@@ -80,10 +80,10 @@ base::Closure WaitableMessageLoopEvent::GetClosure() {
       PIPELINE_OK));
 }
 
-PipelineStatusCB WaitableMessageLoopEvent::GetPipelineStatusCB() {
+PipelineStatusCallback WaitableMessageLoopEvent::GetPipelineStatusCB() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  return BindToCurrentLoop(base::Bind(
-      &WaitableMessageLoopEvent::OnCallback, base::Unretained(this)));
+  return BindToCurrentLoop(base::BindOnce(&WaitableMessageLoopEvent::OnCallback,
+                                          base::Unretained(this)));
 }
 
 void WaitableMessageLoopEvent::RunAndWait() {

media/base/test_helpers.h

@@ -52,7 +52,7 @@ class WaitableMessageLoopEvent {
 
   // Returns a thread-safe closure that will signal |this| when executed.
   base::Closure GetClosure();
-  PipelineStatusCB GetPipelineStatusCB();
+  PipelineStatusCallback GetPipelineStatusCB();
 
   // Runs the current message loop until |this| has been signaled.
   //

media/renderers/audio_renderer_impl_unittest.cc

@@ -208,12 +208,13 @@ class AudioRendererImplTest : public ::testing::Test, public RendererClient {
   MOCK_METHOD1(OnRemotePlayStateChange, void(MediaStatus::State state));
 
   void InitializeRenderer(DemuxerStream* demuxer_stream,
-                          const PipelineStatusCB& pipeline_status_cb) {
+                          PipelineStatusCallback pipeline_status_cb) {
     EXPECT_CALL(*this, OnWaiting(_)).Times(0);
     EXPECT_CALL(*this, OnVideoNaturalSizeChange(_)).Times(0);
     EXPECT_CALL(*this, OnVideoOpacityChange(_)).Times(0);
     EXPECT_CALL(*this, OnVideoConfigChange(_)).Times(0);
-    renderer_->Initialize(demuxer_stream, nullptr, this, pipeline_status_cb);
+    renderer_->Initialize(demuxer_stream, nullptr, this,
+                          std::move(pipeline_status_cb));
   }
 
   void Initialize() {

media/renderers/video_renderer_impl_unittest.cc

@@ -222,10 +222,11 @@ class VideoRendererImplTest : public testing::Test {
     SCOPED_TRACE(base::StringPrintf("WaitForError(%d)", expected));
 
     WaitableMessageLoopEvent event;
-    PipelineStatusCB error_cb = event.GetPipelineStatusCB();
+    PipelineStatusCallback error_cb = event.GetPipelineStatusCB();
     EXPECT_CALL(mock_cb_, OnError(_))
-        .WillOnce(Invoke(
-            [error_cb](PipelineStatus status) { error_cb.Run(status); }));
+        .WillOnce(Invoke([cb = &error_cb](PipelineStatus status) {
+          std::move(*cb).Run(status);
+        }));
     event.RunAndWaitForStatus(expected);
   }
 

third_party/blink/renderer/modules/mediastream/webmediaplayer_ms_test.cc

@@ -192,7 +192,7 @@ class ReusableMessageLoopEvent {
 
   base::RepeatingClosure GetClosure() const { return event_->GetClosure(); }
 
-  media::PipelineStatusCB GetPipelineStatusCB() const {
+  media::PipelineStatusCallback GetPipelineStatusCB() const {
     return event_->GetPipelineStatusCB();
   }