| Index: media/base/pipeline_unittest.cc
|
| diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc
|
| index d2a7a8f3df59ebd0d2f8447647aa0bdaecb99c34..6c4ae1230d60ec35a47eb928b2922c60f7f3eb46 100644
|
| --- a/media/base/pipeline_unittest.cc
|
| +++ b/media/base/pipeline_unittest.cc
|
| @@ -208,7 +208,7 @@ class PipelineTest : public ::testing::Test {
|
| // Startup sequence.
|
| EXPECT_CALL(*audio_renderer_, Preroll(base::TimeDelta(), _))
|
| .WillOnce(RunCallback<1>(PIPELINE_OK));
|
| - EXPECT_CALL(*audio_renderer_, Play());
|
| + EXPECT_CALL(*audio_renderer_, StartRendering());
|
| }
|
| EXPECT_CALL(callbacks_, OnPrerollCompleted());
|
| }
|
| @@ -258,14 +258,14 @@ class PipelineTest : public ::testing::Test {
|
| .WillOnce(RunCallback<1>(PIPELINE_OK));
|
|
|
| if (audio_stream_) {
|
| - EXPECT_CALL(*audio_renderer_, Pause());
|
| + EXPECT_CALL(*audio_renderer_, StopRendering());
|
| EXPECT_CALL(*audio_renderer_, Flush(_))
|
| .WillOnce(RunClosure<0>());
|
| EXPECT_CALL(*audio_renderer_, Preroll(seek_time, _))
|
| .WillOnce(RunCallback<1>(PIPELINE_OK));
|
| EXPECT_CALL(*audio_renderer_, SetPlaybackRate(_));
|
| EXPECT_CALL(*audio_renderer_, SetVolume(_));
|
| - EXPECT_CALL(*audio_renderer_, Play());
|
| + EXPECT_CALL(*audio_renderer_, StartRendering());
|
| }
|
|
|
| if (video_stream_) {
|
| @@ -664,7 +664,7 @@ TEST_F(PipelineTest, ErrorDuringSeek) {
|
| base::TimeDelta seek_time = base::TimeDelta::FromSeconds(5);
|
|
|
| // Preroll() isn't called as the demuxer errors out first.
|
| - EXPECT_CALL(*audio_renderer_, Pause());
|
| + EXPECT_CALL(*audio_renderer_, StopRendering());
|
| EXPECT_CALL(*audio_renderer_, Flush(_))
|
| .WillOnce(RunClosure<0>());
|
| EXPECT_CALL(*audio_renderer_, Stop(_))
|
| @@ -718,7 +718,7 @@ TEST_F(PipelineTest, NoMessageDuringTearDownFromError) {
|
| base::TimeDelta seek_time = base::TimeDelta::FromSeconds(5);
|
|
|
| // Seek() isn't called as the demuxer errors out first.
|
| - EXPECT_CALL(*audio_renderer_, Pause());
|
| + EXPECT_CALL(*audio_renderer_, StopRendering());
|
| EXPECT_CALL(*audio_renderer_, Flush(_))
|
| .WillOnce(RunClosure<0>());
|
| EXPECT_CALL(*audio_renderer_, Stop(_))
|
| @@ -808,14 +808,14 @@ TEST_F(PipelineTest, AudioTimeUpdateDuringSeek) {
|
| .WillOnce(DoAll(InvokeWithoutArgs(&closure, &base::Closure::Run),
|
| RunCallback<1>(PIPELINE_OK)));
|
|
|
| - EXPECT_CALL(*audio_renderer_, Pause());
|
| + EXPECT_CALL(*audio_renderer_, StopRendering());
|
| EXPECT_CALL(*audio_renderer_, Flush(_))
|
| .WillOnce(RunClosure<0>());
|
| EXPECT_CALL(*audio_renderer_, Preroll(seek_time, _))
|
| .WillOnce(RunCallback<1>(PIPELINE_OK));
|
| EXPECT_CALL(*audio_renderer_, SetPlaybackRate(_));
|
| EXPECT_CALL(*audio_renderer_, SetVolume(_));
|
| - EXPECT_CALL(*audio_renderer_, Play());
|
| + EXPECT_CALL(*audio_renderer_, StartRendering());
|
|
|
| EXPECT_CALL(callbacks_, OnPrerollCompleted());
|
| EXPECT_CALL(callbacks_, OnSeek(PIPELINE_OK));
|
| @@ -1001,7 +1001,7 @@ class PipelineTeardownTest : public PipelineTest {
|
| EXPECT_CALL(*video_renderer_, SetPlaybackRate(0.0f));
|
| EXPECT_CALL(*audio_renderer_, SetVolume(1.0f));
|
|
|
| - EXPECT_CALL(*audio_renderer_, Play());
|
| + EXPECT_CALL(*audio_renderer_, StartRendering());
|
| EXPECT_CALL(*video_renderer_, Play(_))
|
| .WillOnce(RunClosure<0>());
|
|
|
| @@ -1037,18 +1037,18 @@ class PipelineTeardownTest : public PipelineTest {
|
|
|
| if (state == kPausing) {
|
| if (stop_or_error == kStop) {
|
| - EXPECT_CALL(*audio_renderer_, Pause())
|
| + EXPECT_CALL(*audio_renderer_, StopRendering())
|
| .WillOnce(Stop(pipeline_.get(), stop_cb));
|
| } else {
|
| status = PIPELINE_ERROR_READ;
|
| - EXPECT_CALL(*audio_renderer_, Pause())
|
| + EXPECT_CALL(*audio_renderer_, StopRendering())
|
| .WillOnce(SetError(pipeline_.get(), status));
|
| }
|
|
|
| return status;
|
| }
|
|
|
| - EXPECT_CALL(*audio_renderer_, Pause());
|
| + EXPECT_CALL(*audio_renderer_, StopRendering());
|
|
|
| if (state == kFlushing) {
|
| if (stop_or_error == kStop) {
|
| @@ -1109,11 +1109,11 @@ class PipelineTeardownTest : public PipelineTest {
|
|
|
| if (state == kStarting) {
|
| if (stop_or_error == kStop) {
|
| - EXPECT_CALL(*audio_renderer_, Play())
|
| + EXPECT_CALL(*video_renderer_, Play(_))
|
| .WillOnce(Stop(pipeline_.get(), stop_cb));
|
| } else {
|
| status = PIPELINE_ERROR_READ;
|
| - EXPECT_CALL(*audio_renderer_, Play())
|
| + EXPECT_CALL(*video_renderer_, Play(_))
|
| .WillOnce(SetError(pipeline_.get(), status));
|
| }
|
| return status;
|
|
|