summaryrefslogtreecommitdiffstats
path: root/media/base/pipeline_impl_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'media/base/pipeline_impl_unittest.cc')
-rw-r--r--media/base/pipeline_impl_unittest.cc10
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());