diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 19:25:17 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 19:25:17 +0000 |
| commit | de8e9b6694fbb7812aff49ddc5db147f5a5918a0 (patch) | |
| tree | bdcc1e2f5a22381dfef1452338b661450def329c /media/base/pipeline_unittest.cc | |
| parent | 92f502dd84ac397c556afd3297c44bf49e796d38 (diff) | |
| download | chromium_src-de8e9b6694fbb7812aff49ddc5db147f5a5918a0.zip chromium_src-de8e9b6694fbb7812aff49ddc5db147f5a5918a0.tar.gz chromium_src-de8e9b6694fbb7812aff49ddc5db147f5a5918a0.tar.bz2 | |
Rename AudioRenderer/VideoRenderer::Seek() to Preroll().
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10795073
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148164 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/pipeline_unittest.cc')
| -rw-r--r-- | media/base/pipeline_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc index c2f2d0f..1ff12c2 100644 --- a/media/base/pipeline_unittest.cc +++ b/media/base/pipeline_unittest.cc @@ -186,7 +186,7 @@ class PipelineTest : public ::testing::Test { // Startup sequence. EXPECT_CALL(*mocks_->video_renderer(), - Seek(mocks_->demuxer()->GetStartTime(), _)) + Preroll(mocks_->demuxer()->GetStartTime(), _)) .WillOnce(RunPipelineStatusCB1()); EXPECT_CALL(*mocks_->video_renderer(), Play(_)) .WillOnce(RunClosure()); @@ -211,7 +211,7 @@ class PipelineTest : public ::testing::Test { EXPECT_CALL(*mocks_->audio_renderer(), SetVolume(1.0f)); // Startup sequence. - EXPECT_CALL(*mocks_->audio_renderer(), Seek(base::TimeDelta(), _)) + EXPECT_CALL(*mocks_->audio_renderer(), Preroll(base::TimeDelta(), _)) .WillOnce(RunPipelineStatusCB1()); EXPECT_CALL(*mocks_->audio_renderer(), Play(_)) .WillOnce(RunClosure()); @@ -256,7 +256,7 @@ class PipelineTest : public ::testing::Test { .WillOnce(RunClosure()); EXPECT_CALL(*mocks_->audio_renderer(), Flush(_)) .WillOnce(RunClosure()); - EXPECT_CALL(*mocks_->audio_renderer(), Seek(seek_time, _)) + EXPECT_CALL(*mocks_->audio_renderer(), Preroll(seek_time, _)) .WillOnce(RunPipelineStatusCB1()); EXPECT_CALL(*mocks_->audio_renderer(), Play(_)) .WillOnce(RunClosure()); @@ -267,7 +267,7 @@ class PipelineTest : public ::testing::Test { .WillOnce(RunClosure()); EXPECT_CALL(*mocks_->video_renderer(), Flush(_)) .WillOnce(RunClosure()); - EXPECT_CALL(*mocks_->video_renderer(), Seek(seek_time, _)) + EXPECT_CALL(*mocks_->video_renderer(), Preroll(seek_time, _)) .WillOnce(RunPipelineStatusCB1()); EXPECT_CALL(*mocks_->video_renderer(), Play(_)) .WillOnce(RunClosure()); @@ -891,7 +891,7 @@ TEST_F(PipelineTest, AudioTimeUpdateDuringSeek) { .WillOnce(RunClosure()); EXPECT_CALL(*mocks_->audio_renderer(), Flush(_)) .WillOnce(RunClosure()); - EXPECT_CALL(*mocks_->audio_renderer(), Seek(seek_time, _)) + EXPECT_CALL(*mocks_->audio_renderer(), Preroll(seek_time, _)) .WillOnce(RunPipelineStatusCB1()); EXPECT_CALL(*mocks_->audio_renderer(), Play(_)) .WillOnce(RunClosure()); |