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

Unified Diff: media/filters/audio_renderer_base_unittest.cc

Issue 9310028: Update AudioRenderer, VideoRenderer, and AudioDecoder Initialize() methods to use PipelineStatusCB. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix AudioRendererImplTest Created 8 years, 11 months 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
« no previous file with comments | « media/filters/audio_renderer_base.cc ('k') | media/filters/ffmpeg_audio_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/audio_renderer_base_unittest.cc
diff --git a/media/filters/audio_renderer_base_unittest.cc b/media/filters/audio_renderer_base_unittest.cc
index 976743c42be252cbc7668c37f0271fb2a6c3b826..c08a31420ac304196fbaddf8409008255bda8e39 100644
--- a/media/filters/audio_renderer_base_unittest.cc
+++ b/media/filters/audio_renderer_base_unittest.cc
@@ -95,7 +95,7 @@ class AudioRendererBaseTest : public ::testing::Test {
EXPECT_CALL(*renderer_, OnInitialize(_, _, _))
.WillOnce(Return(true));
renderer_->Initialize(
- decoder_, NewExpectedClosure(), NewUnderflowClosure());
+ decoder_, NewExpectedStatusCB(PIPELINE_OK), NewUnderflowClosure());
}
void Preroll() {
@@ -221,8 +221,10 @@ class AudioRendererBaseTest : public ::testing::Test {
TEST_F(AudioRendererBaseTest, Initialize_Failed) {
EXPECT_CALL(*renderer_, OnInitialize(_, _, _))
.WillOnce(Return(false));
- EXPECT_CALL(host_, SetError(PIPELINE_ERROR_INITIALIZATION_FAILED));
- renderer_->Initialize(decoder_, NewExpectedClosure(), NewUnderflowClosure());
+ renderer_->Initialize(
+ decoder_,
+ NewExpectedStatusCB(PIPELINE_ERROR_INITIALIZATION_FAILED),
+ NewUnderflowClosure());
// We should have no reads.
EXPECT_TRUE(read_cb_.is_null());
@@ -231,7 +233,8 @@ TEST_F(AudioRendererBaseTest, Initialize_Failed) {
TEST_F(AudioRendererBaseTest, Initialize_Successful) {
EXPECT_CALL(*renderer_, OnInitialize(_, _, _))
.WillOnce(Return(true));
- renderer_->Initialize(decoder_, NewExpectedClosure(), NewUnderflowClosure());
+ renderer_->Initialize(decoder_, NewExpectedStatusCB(PIPELINE_OK),
+ NewUnderflowClosure());
// We should have no reads.
EXPECT_TRUE(read_cb_.is_null());
« no previous file with comments | « media/filters/audio_renderer_base.cc ('k') | media/filters/ffmpeg_audio_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698