Index: media/filters/audio_renderer_impl_unittest.cc |
diff --git a/media/filters/audio_renderer_impl_unittest.cc b/media/filters/audio_renderer_impl_unittest.cc |
index 7556fc717189e83001cef2c7531dcad53abafb00..59378704f2f0c638587e9ee7eba0752da6a36b09 100644 |
--- a/media/filters/audio_renderer_impl_unittest.cc |
+++ b/media/filters/audio_renderer_impl_unittest.cc |
@@ -229,17 +229,12 @@ class AudioRendererImplTest : public ::testing::Test { |
} |
void Play() { |
- SCOPED_TRACE("Play()"); |
- WaitableMessageLoopEvent event; |
- renderer_->Play(event.GetClosure()); |
+ renderer_->Play(); |
renderer_->SetPlaybackRate(1.0f); |
- event.RunAndWait(); |
} |
void Pause() { |
- WaitableMessageLoopEvent pause_event; |
- renderer_->Pause(pause_event.GetClosure()); |
- pause_event.RunAndWait(); |
+ renderer_->Pause(); |
} |
void Seek() { |
@@ -766,31 +761,6 @@ TEST_F(AudioRendererImplTest, AbortPendingRead_Preroll) { |
Preroll(1000, PIPELINE_OK); |
} |
-TEST_F(AudioRendererImplTest, AbortPendingRead_Pause) { |
- Initialize(); |
- |
- Preroll(); |
- Play(); |
- |
- // Partially drain internal buffer so we get a pending read. |
- EXPECT_TRUE(ConsumeBufferedData(frames_buffered() / 2, NULL)); |
- WaitForPendingRead(); |
- |
- // Start pausing. |
- WaitableMessageLoopEvent event; |
- renderer_->Pause(event.GetClosure()); |
- |
- // Simulate the decoder aborting the pending read. |
- AbortPendingRead(); |
- event.RunAndWait(); |
- |
- Flush(); |
- |
- // Preroll again to a different timestamp and verify it completed normally. |
- Preroll(1000, PIPELINE_OK); |
-} |
- |
- |
TEST_F(AudioRendererImplTest, AbortPendingRead_Flush) { |
Initialize(); |
@@ -819,30 +789,6 @@ TEST_F(AudioRendererImplTest, AbortPendingRead_Flush) { |
Preroll(1000, PIPELINE_OK); |
} |
-TEST_F(AudioRendererImplTest, PendingRead_Pause) { |
- Initialize(); |
- |
- Preroll(); |
- Play(); |
- |
- // Partially drain internal buffer so we get a pending read. |
- EXPECT_TRUE(ConsumeBufferedData(frames_buffered() / 2, NULL)); |
- WaitForPendingRead(); |
- |
- // Start pausing. |
- WaitableMessageLoopEvent event; |
- renderer_->Pause(event.GetClosure()); |
- |
- SatisfyPendingRead(kDataSize); |
- |
- event.RunAndWait(); |
- |
- Flush(); |
- |
- // Preroll again to a different timestamp and verify it completed normally. |
- Preroll(1000, PIPELINE_OK); |
-} |
- |
TEST_F(AudioRendererImplTest, PendingRead_Flush) { |
Initialize(); |