Replace WaitableEvents and ConditionalVariables in VideoRendererBase tests with MessageLoop.

media/filters/ffmpeg_demuxer_unittest.cc

Index: media/filters/ffmpeg_demuxer_unittest.cc
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index 9ce865938d8352ab565492e5a631b81354a7ea1e..4153cb813a396e4f0bce03d394c938d4136d3940 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -87,7 +87,7 @@ class FFmpegDemuxerTest : public testing::Test {
 
   void InitializeDemuxer() {
     EXPECT_CALL(host_, SetDuration(_));
-    demuxer_->Initialize(&host_, NewStatusCB(PIPELINE_OK));
+    demuxer_->Initialize(&host_, NewExpectedStatusAndQuitCB(PIPELINE_OK));
     message_loop_.Run();
   }
 
@@ -122,18 +122,6 @@ class FFmpegDemuxerTest : public testing::Test {
                       location, size, timestampInMicroseconds);
   }
 
-  PipelineStatusCB NewStatusCB(PipelineStatus expected) {
-    return base::Bind(&FFmpegDemuxerTest::OnStatusDone,
-                      base::Unretained(this), expected);
-  }
-
-  void OnStatusDone(PipelineStatus expected, PipelineStatus status) {
-    EXPECT_EQ(expected, status);
-
-    DCHECK_EQ(&message_loop_, MessageLoop::current());
-    message_loop_.PostTask(FROM_HERE, MessageLoop::QuitWhenIdleClosure());
-  }
-
   // Accessor to demuxer internals.
   void set_duration_known(bool duration_known) {
     demuxer_->duration_known_ = duration_known;
@@ -192,7 +180,8 @@ class FFmpegDemuxerTest : public testing::Test {
 TEST_F(FFmpegDemuxerTest, Initialize_OpenFails) {
   // Simulate avformat_open_input() failing.
   CreateDemuxer("ten_byte_file");
-  demuxer_->Initialize(&host_, NewStatusCB(DEMUXER_ERROR_COULD_NOT_OPEN));
+  demuxer_->Initialize(
+      &host_, NewExpectedStatusAndQuitCB(DEMUXER_ERROR_COULD_NOT_OPEN));
   message_loop_.Run();
 }
 
@@ -209,14 +198,16 @@ TEST_F(FFmpegDemuxerTest, Initialize_OpenFails) {
 TEST_F(FFmpegDemuxerTest, Initialize_NoStreams) {
   // Open a file with no streams whatsoever.
   CreateDemuxer("no_streams.webm");
-  demuxer_->Initialize(&host_, NewStatusCB(DEMUXER_ERROR_NO_SUPPORTED_STREAMS));
+  demuxer_->Initialize(
+      &host_, NewExpectedStatusAndQuitCB(DEMUXER_ERROR_NO_SUPPORTED_STREAMS));
   message_loop_.Run();
 }
 
 TEST_F(FFmpegDemuxerTest, Initialize_NoAudioVideo) {
   // Open a file containing streams but none of which are audio/video streams.
   CreateDemuxer("no_audio_video.webm");
-  demuxer_->Initialize(&host_, NewStatusCB(DEMUXER_ERROR_NO_SUPPORTED_STREAMS));
+  demuxer_->Initialize(
+      &host_, NewExpectedStatusAndQuitCB(DEMUXER_ERROR_NO_SUPPORTED_STREAMS));
   message_loop_.Run();
 }
 
@@ -381,7 +372,7 @@ TEST_F(FFmpegDemuxerTest, Seek) {
 
   // Issue a simple forward seek, which should discard queued packets.
   demuxer_->Seek(base::TimeDelta::FromMicroseconds(1000000),
-                 NewStatusCB(PIPELINE_OK));
+                 NewExpectedStatusAndQuitCB(PIPELINE_OK));
   message_loop_.Run();
 
   // Audio read #1.
@@ -554,7 +545,7 @@ TEST_F(FFmpegDemuxerTest, SeekWithCuesBeforeFirstCluster) {
 
   // Issue a simple forward seek, which should discard queued packets.
   demuxer_->Seek(base::TimeDelta::FromMicroseconds(2500000),
-                 NewStatusCB(PIPELINE_OK));
+                 NewExpectedStatusAndQuitCB(PIPELINE_OK));
   message_loop_.Run();
 
   // Audio read #1.