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

Unified Diff: media/base/pipeline_unittest.cc

Issue 526653002: Replace init_cb in Renderer::Initialize() with base::Closure. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 6 years, 3 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
Index: media/base/pipeline_unittest.cc
diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc
index cca82ebb7d4a51b72474d3d1dbbd658e2e07f964..af5f9497c28a3684d2efec448b6225f48901a737 100644
--- a/media/base/pipeline_unittest.cc
+++ b/media/base/pipeline_unittest.cc
@@ -166,7 +166,7 @@ class PipelineTest : public ::testing::Test {
EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _, _))
.WillOnce(DoAll(SaveArg<2>(&ended_cb_),
SaveArg<4>(&buffering_state_cb_),
- RunCallback<0>(PIPELINE_OK)));
+ RunCallback<0>()));
EXPECT_CALL(*renderer_, HasAudio()).WillRepeatedly(Return(audio_stream()));
EXPECT_CALL(*renderer_, HasVideo()).WillRepeatedly(Return(video_stream()));
}
@@ -830,12 +830,12 @@ class PipelineTeardownTest : public PipelineTest {
if (stop_or_error == kStop) {
EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _, _))
.WillOnce(DoAll(Stop(pipeline_.get(), stop_cb),
- RunCallback<0>(PIPELINE_OK)));
+ RunCallback<0>()));
ExpectPipelineStopAndDestroyPipeline();
} else {
status = PIPELINE_ERROR_INITIALIZATION_FAILED;
EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _, _))
- .WillOnce(RunCallback<0>(status));
+ .WillOnce(DoAll(RunCallback<3>(status), RunCallback<0>()));
}
EXPECT_CALL(*demuxer_, Stop());
@@ -844,7 +844,7 @@ class PipelineTeardownTest : public PipelineTest {
EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _, _))
.WillOnce(DoAll(SaveArg<4>(&buffering_state_cb_),
- RunCallback<0>(PIPELINE_OK)));
+ RunCallback<0>()));
EXPECT_CALL(callbacks_, OnMetadata(_));
« no previous file with comments | « media/base/pipeline.cc ('k') | media/base/renderer.h » ('j') | media/base/renderer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698