diff options
Diffstat (limited to 'media/base/pipeline_unittest.cc')
| -rw-r--r-- | media/base/pipeline_unittest.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc index 093b51e..09d9fdd 100644 --- a/media/base/pipeline_unittest.cc +++ b/media/base/pipeline_unittest.cc @@ -84,7 +84,6 @@ class PipelineTest : public ::testing::Test { MOCK_METHOD1(OnError, void(PipelineStatus)); MOCK_METHOD1(OnMetadata, void(PipelineMetadata)); MOCK_METHOD1(OnBufferingStateChange, void(BufferingState)); - MOCK_METHOD1(OnVideoFramePaint, void(const scoped_refptr<VideoFrame>&)); MOCK_METHOD0(OnDurationChange, void()); private: @@ -170,9 +169,9 @@ class PipelineTest : public ::testing::Test { // Sets up expectations to allow the video renderer to initialize. void SetRendererExpectations() { - EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _, _, _, _)) + EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _, _, _)) .WillOnce(DoAll(SaveArg<3>(&buffering_state_cb_), - SaveArg<5>(&ended_cb_), + SaveArg<4>(&ended_cb_), PostCallback<1>(PIPELINE_OK))); EXPECT_CALL(*renderer_, HasAudio()).WillRepeatedly(Return(audio_stream())); EXPECT_CALL(*renderer_, HasVideo()).WillRepeatedly(Return(video_stream())); @@ -196,8 +195,6 @@ class PipelineTest : public ::testing::Test { base::Bind(&CallbackHelper::OnMetadata, base::Unretained(&callbacks_)), base::Bind(&CallbackHelper::OnBufferingStateChange, base::Unretained(&callbacks_)), - base::Bind(&CallbackHelper::OnVideoFramePaint, - base::Unretained(&callbacks_)), base::Bind(&CallbackHelper::OnDurationChange, base::Unretained(&callbacks_)), base::Bind(&PipelineTest::OnAddTextTrack, base::Unretained(this)), @@ -858,13 +855,13 @@ class PipelineTeardownTest : public PipelineTest { if (state == kInitRenderer) { if (stop_or_error == kStop) { - EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _, _, _, _)) + EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _, _, _)) .WillOnce(DoAll(Stop(pipeline_.get(), stop_cb), PostCallback<1>(PIPELINE_OK))); ExpectPipelineStopAndDestroyPipeline(); } else { status = PIPELINE_ERROR_INITIALIZATION_FAILED; - EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _, _, _, _)) + EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _, _, _)) .WillOnce(PostCallback<1>(status)); } @@ -873,7 +870,7 @@ class PipelineTeardownTest : public PipelineTest { return status; } - EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _, _, _, _)) + EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _, _, _)) .WillOnce(DoAll(SaveArg<3>(&buffering_state_cb_), PostCallback<1>(PIPELINE_OK))); |