Make Demuxer::Stop() synchronous.

media/filters/ffmpeg_demuxer_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <algorithm>
 #include <deque>
 #include <string>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 49 matching lines @@
 };
 
 
 // Fixture class to facilitate writing tests.  Takes care of setting up the
 // FFmpeg, pipeline and filter host mocks.
 class FFmpegDemuxerTest : public testing::Test {
  protected:
   FFmpegDemuxerTest() {}
 
   virtual ~FFmpegDemuxerTest() {
-    if (demuxer_) {
-      WaitableMessageLoopEvent event;
-      demuxer_->Stop(event.GetClosure());
-      event.RunAndWait();
-    }
+    if (demuxer_)
+      demuxer_->Stop();
   }
 
   void CreateDemuxer(const std::string& name) {
     CHECK(!demuxer_);
 
     EXPECT_CALL(host_, AddBufferedTimeRange(_, _)).Times(AnyNumber());
 
     CreateDataSource(name);
 
     Demuxer::NeedKeyCB need_key_cb =
@@ skipping 661 matching lines @@
 TEST_F(FFmpegDemuxerTest, Stop) {
   // Tests that calling Read() on a stopped demuxer stream immediately deletes
   // the callback.
   CreateDemuxer("bear-320x240.webm");
   InitializeDemuxer();
 
   // Get our stream.
   DemuxerStream* audio = demuxer_->GetStream(DemuxerStream::AUDIO);
   ASSERT_TRUE(audio);
 
-  WaitableMessageLoopEvent event;
-  demuxer_->Stop(event.GetClosure());
-  event.RunAndWait();
+  demuxer_->Stop();
 
   // Reads after being stopped are all EOS buffers.
   StrictMock<MockReadCB> callback;
   EXPECT_CALL(callback, Run(DemuxerStream::kOk, IsEndOfStreamBuffer()));
 
   // Attempt the read...
   audio->Read(base::Bind(&MockReadCB::Run, base::Unretained(&callback)));
   message_loop_.RunUntilIdle();
 
   // Don't let the test call Stop() again.
@@ skipping 138 matching lines @@
     InitializeDemuxer();
 
     // Ensure the expected streams are present.
     DemuxerStream* stream = demuxer_->GetStream(DemuxerStream::VIDEO);
     ASSERT_TRUE(stream);
     stream->EnableBitstreamConverter();
 
     stream->Read(base::Bind(&ValidateAnnexB, stream));
     message_loop_.Run();
 
-    WaitableMessageLoopEvent event;
-    demuxer_->Stop(event.GetClosure());
-    event.RunAndWait();
+    demuxer_->Stop();
     demuxer_.reset();
     data_source_.reset();
   }
 }
 
 TEST_F(FFmpegDemuxerTest, Rotate_Metadata_0) {
   CreateDemuxer("bear_rotate_0.mp4");
   InitializeDemuxer();
 
   DemuxerStream* stream = demuxer_->GetStream(DemuxerStream::VIDEO);
@@ skipping 24 matching lines @@
   InitializeDemuxer();
 
   DemuxerStream* stream = demuxer_->GetStream(DemuxerStream::VIDEO);
   ASSERT_TRUE(stream);
   ASSERT_EQ(VIDEO_ROTATION_270, stream->video_rotation());
 }
 
 #endif
 
 }  // namespace media