Index: media/base/pipeline_unittest.cc |
diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc |
index ec8428f82eb666cd1989009730227e64966edf4f..81575e3bbc4b2036c7e63d5de46934406868eb50 100644 |
--- a/media/base/pipeline_unittest.cc |
+++ b/media/base/pipeline_unittest.cc |
@@ -208,7 +208,7 @@ |
// Startup sequence. |
EXPECT_CALL(*audio_renderer_, Preroll(base::TimeDelta(), _)) |
.WillOnce(RunCallback<1>(PIPELINE_OK)); |
- EXPECT_CALL(*audio_renderer_, StartRendering()); |
+ EXPECT_CALL(*audio_renderer_, Play()); |
} |
EXPECT_CALL(callbacks_, OnPrerollCompleted()); |
} |
@@ -258,14 +258,14 @@ |
.WillOnce(RunCallback<1>(PIPELINE_OK)); |
if (audio_stream_) { |
- EXPECT_CALL(*audio_renderer_, StopRendering()); |
+ EXPECT_CALL(*audio_renderer_, Pause()); |
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_, StartRendering()); |
+ EXPECT_CALL(*audio_renderer_, Play()); |
} |
if (video_stream_) { |
@@ -664,7 +664,7 @@ |
base::TimeDelta seek_time = base::TimeDelta::FromSeconds(5); |
// Preroll() isn't called as the demuxer errors out first. |
- EXPECT_CALL(*audio_renderer_, StopRendering()); |
+ EXPECT_CALL(*audio_renderer_, Pause()); |
EXPECT_CALL(*audio_renderer_, Flush(_)) |
.WillOnce(RunClosure<0>()); |
EXPECT_CALL(*audio_renderer_, Stop(_)) |
@@ -718,7 +718,7 @@ |
base::TimeDelta seek_time = base::TimeDelta::FromSeconds(5); |
// Seek() isn't called as the demuxer errors out first. |
- EXPECT_CALL(*audio_renderer_, StopRendering()); |
+ EXPECT_CALL(*audio_renderer_, Pause()); |
EXPECT_CALL(*audio_renderer_, Flush(_)) |
.WillOnce(RunClosure<0>()); |
EXPECT_CALL(*audio_renderer_, Stop(_)) |
@@ -808,14 +808,14 @@ |
.WillOnce(DoAll(InvokeWithoutArgs(&closure, &base::Closure::Run), |
RunCallback<1>(PIPELINE_OK))); |
- EXPECT_CALL(*audio_renderer_, StopRendering()); |
+ EXPECT_CALL(*audio_renderer_, Pause()); |
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_, StartRendering()); |
+ EXPECT_CALL(*audio_renderer_, Play()); |
EXPECT_CALL(callbacks_, OnPrerollCompleted()); |
EXPECT_CALL(callbacks_, OnSeek(PIPELINE_OK)); |
@@ -999,7 +999,7 @@ |
EXPECT_CALL(*video_renderer_, SetPlaybackRate(0.0f)); |
EXPECT_CALL(*audio_renderer_, SetVolume(1.0f)); |
- EXPECT_CALL(*audio_renderer_, StartRendering()); |
+ EXPECT_CALL(*audio_renderer_, Play()); |
EXPECT_CALL(*video_renderer_, Play(_)) |
.WillOnce(RunClosure<0>()); |
@@ -1035,18 +1035,18 @@ |
if (state == kPausing) { |
if (stop_or_error == kStop) { |
- EXPECT_CALL(*audio_renderer_, StopRendering()) |
+ EXPECT_CALL(*audio_renderer_, Pause()) |
.WillOnce(Stop(pipeline_.get(), stop_cb)); |
} else { |
status = PIPELINE_ERROR_READ; |
- EXPECT_CALL(*audio_renderer_, StopRendering()) |
+ EXPECT_CALL(*audio_renderer_, Pause()) |
.WillOnce(SetError(pipeline_.get(), status)); |
} |
return status; |
} |
- EXPECT_CALL(*audio_renderer_, StopRendering()); |
+ EXPECT_CALL(*audio_renderer_, Pause()); |
if (state == kFlushing) { |
if (stop_or_error == kStop) { |