Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(419)

Unified Diff: media/filters/audio_renderer_impl_unittest.cc

Issue 11275087: Move OnDecoderInitDone() from decoder to pipeline thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comments. Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 fe901f099465cc591d457303f3dac321e6ca7e73..4fe9967a2f6bcddf81bba2db69fe5029f922bc72 100644
--- a/media/filters/audio_renderer_impl_unittest.cc
+++ b/media/filters/audio_renderer_impl_unittest.cc
@@ -5,6 +5,7 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/gtest_prod_util.h"
+#include "base/message_loop.h"
#include "base/stl_util.h"
#include "media/base/data_buffer.h"
#include "media/base/mock_audio_renderer_sink.h"
@@ -58,6 +59,7 @@ class AudioRendererImplTest : public ::testing::Test {
}
virtual ~AudioRendererImplTest() {
+ message_loop_.RunAllPending();
renderer_->Stop(NewExpectedClosure());
}
@@ -101,6 +103,7 @@ class AudioRendererImplTest : public ::testing::Test {
.WillOnce(RunPipelineStatusCB1(PIPELINE_OK));
InitializeWithStatus(PIPELINE_OK);
+ message_loop_.RunAllPending();
}
void InitializeWithStatus(PipelineStatus expected) {
@@ -127,6 +130,7 @@ class AudioRendererImplTest : public ::testing::Test {
EXPECT_CALL(*decoder_, Read(_));
renderer_->Preroll(base::TimeDelta(), NewPrerollCB());
EXPECT_CALL(*this, OnPrerollComplete(PIPELINE_OK));
+ message_loop_.RunAllPending();
DeliverRemainingAudio();
}
@@ -229,6 +233,7 @@ class AudioRendererImplTest : public ::testing::Test {
AudioRendererImpl::AudioDecoderList decoders_;
AudioDecoder::ReadCB read_cb_;
base::TimeDelta next_timestamp_;
+ MessageLoop message_loop_;
private:
void SaveReadCallback(const AudioDecoder::ReadCB& callback) {
« media/filters/audio_renderer_impl.cc ('K') | « media/filters/audio_renderer_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698