diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-17 22:09:28 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-17 22:09:28 +0000 |
| commit | 128740bbcd5abb0c75254e6eb57b46192c1f47d1 (patch) | |
| tree | 635b88468f502fdf65828766735de711e86170e2 /media/base/pipeline_impl_unittest.cc | |
| parent | 6973e1cbd7434f30ed00c49a23838a82f90e8a0f (diff) | |
| download | chromium_src-128740bbcd5abb0c75254e6eb57b46192c1f47d1.zip chromium_src-128740bbcd5abb0c75254e6eb57b46192c1f47d1.tar.gz chromium_src-128740bbcd5abb0c75254e6eb57b46192c1f47d1.tar.bz2 | |
Renamed FilterHost::Error() and Pipeline::GetTime() to more appropriate names.
BUG=17107
TEST=none
Review URL: http://codereview.chromium.org/155711
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21013 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/pipeline_impl_unittest.cc')
| -rw-r--r-- | media/base/pipeline_impl_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc index d6bd285..c3e63e5 100644 --- a/media/base/pipeline_impl_unittest.cc +++ b/media/base/pipeline_impl_unittest.cc @@ -179,10 +179,10 @@ TEST_F(PipelineImplTest, NotStarted) { EXPECT_EQ(1.0f, pipeline_.GetVolume()); pipeline_.SetVolume(-1.0f); EXPECT_EQ(1.0f, pipeline_.GetVolume()); - pipeline_.SetVolume(1.0f); - EXPECT_EQ(1.0f, pipeline_.GetVolume()); + pipeline_.SetVolume(0.0f); + EXPECT_EQ(0.0f, pipeline_.GetVolume()); - EXPECT_TRUE(kZero == pipeline_.GetTime()); + EXPECT_TRUE(kZero == pipeline_.GetCurrentTime()); EXPECT_TRUE(kZero == pipeline_.GetBufferedTime()); EXPECT_TRUE(kZero == pipeline_.GetDuration()); @@ -233,8 +233,8 @@ TEST_F(PipelineImplTest, RequiredFilterMissing) { TEST_F(PipelineImplTest, URLNotFound) { EXPECT_CALL(*mocks_->data_source(), Initialize("", NotNull())) - .WillOnce(DoAll(Error(mocks_->data_source(), - PIPELINE_ERROR_URL_NOT_FOUND), + .WillOnce(DoAll(SetError(mocks_->data_source(), + PIPELINE_ERROR_URL_NOT_FOUND), Invoke(&RunFilterCallback))); EXPECT_CALL(*mocks_->data_source(), Stop()); |