Chromium Code Reviews| Index: media/base/pipeline_unittest.cc |
| diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc |
| index 093b51e02d2c6f877bc6ca1cbeffe63fa3a9e052..c5b59dd72c5f086e13ab7be4d6bedfbebeb1a67d 100644 |
| --- a/media/base/pipeline_unittest.cc |
| +++ b/media/base/pipeline_unittest.cc |
| @@ -212,7 +212,7 @@ class PipelineTest : public ::testing::Test { |
| if (start_status == PIPELINE_OK) { |
| EXPECT_CALL(callbacks_, OnMetadata(_)).WillOnce(SaveArg<0>(&metadata_)); |
| - EXPECT_CALL(*renderer_, SetPlaybackRate(0.0f)); |
| + EXPECT_CALL(*renderer_, SetPlaybackRate(0.0)); |
| EXPECT_CALL(*renderer_, SetVolume(1.0f)); |
| EXPECT_CALL(*renderer_, StartPlayingFrom(start_time_)) |
| .WillOnce(SetBufferingState(&buffering_state_cb_, |
| @@ -340,9 +340,9 @@ TEST_F(PipelineTest, NotStarted) { |
| // Setting should still work. |
| EXPECT_EQ(0.0f, pipeline_->GetPlaybackRate()); |
| - pipeline_->SetPlaybackRate(-1.0f); |
| + pipeline_->SetPlaybackRate(-1.0); |
| EXPECT_EQ(0.0f, pipeline_->GetPlaybackRate()); |
| - pipeline_->SetPlaybackRate(1.0f); |
| + pipeline_->SetPlaybackRate(1.0); |
| EXPECT_EQ(1.0f, pipeline_->GetPlaybackRate()); |
| // Setting should still work. |
| @@ -643,7 +643,7 @@ TEST_F(PipelineTest, ErrorDuringSeek) { |
| SetRendererExpectations(); |
| StartPipelineAndExpect(PIPELINE_OK); |
| - float playback_rate = 1.0f; |
| + double playback_rate = 1.0f; |
|
xhwang
2015/04/22 04:21:15
drop "f"
|
| EXPECT_CALL(*renderer_, SetPlaybackRate(playback_rate)); |
| pipeline_->SetPlaybackRate(playback_rate); |
| message_loop_.RunUntilIdle(); |
| @@ -678,7 +678,7 @@ static void TestNoCallsAfterError( |
| EXPECT_TRUE(message_loop->IsIdleForTesting()); |
| // Make calls on pipeline after error has occurred. |
| - pipeline->SetPlaybackRate(0.5f); |
| + pipeline->SetPlaybackRate(0.5); |
| pipeline->SetVolume(0.5f); |
| // No additional tasks should be queued as a result of these calls. |
| @@ -880,7 +880,7 @@ class PipelineTeardownTest : public PipelineTest { |
| EXPECT_CALL(callbacks_, OnMetadata(_)); |
| // If we get here it's a successful initialization. |
| - EXPECT_CALL(*renderer_, SetPlaybackRate(0.0f)); |
| + EXPECT_CALL(*renderer_, SetPlaybackRate(0.0)); |
| EXPECT_CALL(*renderer_, SetVolume(1.0f)); |
| EXPECT_CALL(*renderer_, StartPlayingFrom(base::TimeDelta())) |
| .WillOnce(SetBufferingState(&buffering_state_cb_, |