| Index: media/renderers/renderer_impl_unittest.cc
|
| diff --git a/media/renderers/renderer_impl_unittest.cc b/media/renderers/renderer_impl_unittest.cc
|
| index 75fc0500dd18b820639cc9b05151c03fe5138af7..9fcefe425918f3360a76fdb1f73790283aa72ec8 100644
|
| --- a/media/renderers/renderer_impl_unittest.cc
|
| +++ b/media/renderers/renderer_impl_unittest.cc
|
| @@ -49,7 +49,6 @@ class RendererImplTest : public ::testing::Test {
|
| MOCK_METHOD1(OnError, void(PipelineStatus));
|
| MOCK_METHOD1(OnUpdateStatistics, void(const PipelineStatistics&));
|
| MOCK_METHOD1(OnBufferingStateChange, void(BufferingState));
|
| - MOCK_METHOD1(OnVideoFramePaint, void(const scoped_refptr<VideoFrame>&));
|
| MOCK_METHOD0(OnWaitingForDecryptionKey, void());
|
|
|
| private:
|
| @@ -98,9 +97,9 @@ class RendererImplTest : public ::testing::Test {
|
| // Sets up expectations to allow the video renderer to initialize.
|
| void SetVideoRendererInitializeExpectations(PipelineStatus status) {
|
| EXPECT_CALL(*video_renderer_,
|
| - Initialize(video_stream_.get(), _, _, _, _, _, _, _, _, _))
|
| + Initialize(video_stream_.get(), _, _, _, _, _, _, _, _))
|
| .WillOnce(DoAll(SaveArg<4>(&video_buffering_state_cb_),
|
| - SaveArg<6>(&video_ended_cb_), RunCallback<1>(status)));
|
| + SaveArg<5>(&video_ended_cb_), RunCallback<1>(status)));
|
| }
|
|
|
| void InitializeAndExpect(PipelineStatus start_status) {
|
| @@ -122,8 +121,6 @@ class RendererImplTest : public ::testing::Test {
|
| base::Unretained(&callbacks_)),
|
| base::Bind(&CallbackHelper::OnBufferingStateChange,
|
| base::Unretained(&callbacks_)),
|
| - base::Bind(&CallbackHelper::OnVideoFramePaint,
|
| - base::Unretained(&callbacks_)),
|
| base::Bind(&CallbackHelper::OnEnded, base::Unretained(&callbacks_)),
|
| base::Bind(&CallbackHelper::OnError, base::Unretained(&callbacks_)),
|
| base::Bind(&CallbackHelper::OnWaitingForDecryptionKey,
|
| @@ -475,10 +472,10 @@ TEST_F(RendererImplTest, ErrorDuringInitialize) {
|
|
|
| // Force an audio error to occur during video renderer initialization.
|
| EXPECT_CALL(*video_renderer_,
|
| - Initialize(video_stream_.get(), _, _, _, _, _, _, _, _, _))
|
| + Initialize(video_stream_.get(), _, _, _, _, _, _, _, _))
|
| .WillOnce(DoAll(AudioError(&audio_error_cb_, PIPELINE_ERROR_DECODE),
|
| SaveArg<4>(&video_buffering_state_cb_),
|
| - SaveArg<6>(&video_ended_cb_),
|
| + SaveArg<5>(&video_ended_cb_),
|
| RunCallback<1>(PIPELINE_OK)));
|
|
|
| InitializeAndExpect(PIPELINE_ERROR_DECODE);
|
|
|