Index: media/blink/webmediaplayer_impl_unittest.cc |
diff --git a/media/blink/webmediaplayer_impl_unittest.cc b/media/blink/webmediaplayer_impl_unittest.cc |
index ca664355daf37adbdb658617c4630fff112b7602..0372011bfafecf10c7edc241e4e19ad057d8fd8a 100644 |
--- a/media/blink/webmediaplayer_impl_unittest.cc |
+++ b/media/blink/webmediaplayer_impl_unittest.cc |
@@ -279,12 +279,12 @@ class WebMediaPlayerImplTest : public testing::Test { |
wmpi_->SetDelegateState(state, false); |
} |
- bool ShouldDisableVideoWhenHidden() const { |
- return wmpi_->ShouldDisableVideoWhenHidden(); |
+ bool ShouldDisableVideoWhenBackground() const { |
+ return wmpi_->ShouldDisableVideoWhenBackground(); |
} |
- bool ShouldPauseVideoWhenHidden() const { |
- return wmpi_->ShouldPauseVideoWhenHidden(); |
+ bool ShouldPauseVideoWhenBackground() const { |
+ return wmpi_->ShouldPauseVideoWhenBackground(); |
} |
bool IsBackgroundOptimizationCandidate() const { |
@@ -689,34 +689,34 @@ TEST_F(WebMediaPlayerImplTest, BackgroundOptimizationsFeatureEnabled) { |
// Audible video. |
SetMetadata(true, true); |
EXPECT_TRUE(IsBackgroundOptimizationCandidate()); |
- EXPECT_TRUE(ShouldDisableVideoWhenHidden()); |
- EXPECT_FALSE(ShouldPauseVideoWhenHidden()); |
+ EXPECT_TRUE(ShouldDisableVideoWhenBackground()); |
+ EXPECT_FALSE(ShouldPauseVideoWhenBackground()); |
// Video only. |
SetMetadata(false, true); |
EXPECT_TRUE(IsBackgroundOptimizationCandidate()); |
- EXPECT_TRUE(ShouldPauseVideoWhenHidden()); |
- EXPECT_FALSE(ShouldDisableVideoWhenHidden()); |
+ EXPECT_TRUE(ShouldPauseVideoWhenBackground()); |
+ EXPECT_FALSE(ShouldDisableVideoWhenBackground()); |
// Audio only. |
SetMetadata(true, false); |
EXPECT_FALSE(IsBackgroundOptimizationCandidate()); |
- EXPECT_FALSE(ShouldPauseVideoWhenHidden()); |
- EXPECT_FALSE(ShouldDisableVideoWhenHidden()); |
+ EXPECT_FALSE(ShouldPauseVideoWhenBackground()); |
+ EXPECT_FALSE(ShouldDisableVideoWhenBackground()); |
// Duration is shorter than max video keyframe distance. |
SetDuration(base::TimeDelta::FromSeconds(5)); |
SetMetadata(true, true); |
EXPECT_TRUE(IsBackgroundOptimizationCandidate()); |
- EXPECT_FALSE(ShouldPauseVideoWhenHidden()); |
- EXPECT_TRUE(ShouldDisableVideoWhenHidden()); |
+ EXPECT_FALSE(ShouldPauseVideoWhenBackground()); |
+ EXPECT_TRUE(ShouldDisableVideoWhenBackground()); |
// Average keyframe distance is too big. |
SetVideoKeyframeDistanceAverage(base::TimeDelta::FromSeconds(100)); |
SetDuration(base::TimeDelta::FromSeconds(300)); |
EXPECT_FALSE(IsBackgroundOptimizationCandidate()); |
- EXPECT_FALSE(ShouldPauseVideoWhenHidden()); |
- EXPECT_FALSE(ShouldDisableVideoWhenHidden()); |
+ EXPECT_FALSE(ShouldPauseVideoWhenBackground()); |
+ EXPECT_FALSE(ShouldDisableVideoWhenBackground()); |
} |
TEST_F(WebMediaPlayerImplTest, BackgroundOptimizationsFeatureDisabled) { |
@@ -730,51 +730,51 @@ TEST_F(WebMediaPlayerImplTest, BackgroundOptimizationsFeatureDisabled) { |
// Audible video. |
SetMetadata(true, true); |
EXPECT_TRUE(IsBackgroundOptimizationCandidate()); |
- EXPECT_FALSE(ShouldDisableVideoWhenHidden()); |
- EXPECT_FALSE(ShouldPauseVideoWhenHidden()); |
+ EXPECT_FALSE(ShouldDisableVideoWhenBackground()); |
+ EXPECT_FALSE(ShouldPauseVideoWhenBackground()); |
// Video only (pausing is enabled on Android). |
SetMetadata(false, true); |
EXPECT_TRUE(IsBackgroundOptimizationCandidate()); |
- EXPECT_FALSE(ShouldDisableVideoWhenHidden()); |
+ EXPECT_FALSE(ShouldDisableVideoWhenBackground()); |
#if defined(OS_ANDROID) |
- EXPECT_TRUE(ShouldPauseVideoWhenHidden()); |
+ EXPECT_TRUE(ShouldPauseVideoWhenBackground()); |
// On Android, the duration and keyframe distance don't matter for video-only. |
SetDuration(base::TimeDelta::FromSeconds(5)); |
EXPECT_TRUE(IsBackgroundOptimizationCandidate()); |
- EXPECT_TRUE(ShouldPauseVideoWhenHidden()); |
+ EXPECT_TRUE(ShouldPauseVideoWhenBackground()); |
SetVideoKeyframeDistanceAverage(base::TimeDelta::FromSeconds(100)); |
SetDuration(base::TimeDelta::FromSeconds(300)); |
EXPECT_TRUE(IsBackgroundOptimizationCandidate()); |
- EXPECT_TRUE(ShouldPauseVideoWhenHidden()); |
+ EXPECT_TRUE(ShouldPauseVideoWhenBackground()); |
// Restore average keyframe distance. |
SetVideoKeyframeDistanceAverage(base::TimeDelta::FromSeconds(5)); |
#else |
- EXPECT_FALSE(ShouldPauseVideoWhenHidden()); |
+ EXPECT_FALSE(ShouldPauseVideoWhenBackground()); |
#endif |
// Audio only. |
SetMetadata(true, false); |
EXPECT_FALSE(IsBackgroundOptimizationCandidate()); |
- EXPECT_FALSE(ShouldPauseVideoWhenHidden()); |
- EXPECT_FALSE(ShouldDisableVideoWhenHidden()); |
+ EXPECT_FALSE(ShouldPauseVideoWhenBackground()); |
+ EXPECT_FALSE(ShouldDisableVideoWhenBackground()); |
// Duration is shorter than max video keyframe distance. |
SetDuration(base::TimeDelta::FromSeconds(5)); |
SetMetadata(true, true); |
EXPECT_TRUE(IsBackgroundOptimizationCandidate()); |
- EXPECT_FALSE(ShouldPauseVideoWhenHidden()); |
- EXPECT_FALSE(ShouldDisableVideoWhenHidden()); |
+ EXPECT_FALSE(ShouldPauseVideoWhenBackground()); |
+ EXPECT_FALSE(ShouldDisableVideoWhenBackground()); |
// Average keyframe distance is too big. |
SetVideoKeyframeDistanceAverage(base::TimeDelta::FromSeconds(100)); |
SetDuration(base::TimeDelta::FromSeconds(300)); |
EXPECT_FALSE(IsBackgroundOptimizationCandidate()); |
- EXPECT_FALSE(ShouldPauseVideoWhenHidden()); |
- EXPECT_FALSE(ShouldDisableVideoWhenHidden()); |
+ EXPECT_FALSE(ShouldPauseVideoWhenBackground()); |
+ EXPECT_FALSE(ShouldDisableVideoWhenBackground()); |
} |
} // namespace media |