Revert of Disable pausing background video-only players on desktop.

media/blink/webmediaplayer_impl_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/blink/webmediaplayer_impl.h"
 
 #include <stdint.h>
 
 #include <memory>
 
@@ skipping 848 matching lines @@
 
   // There's no optimization criteria for video only on Android.
   bool matches_requirements =
       IsAndroid() ||
       ((GetDurationSec() < GetAverageKeyframeDistanceSec()) ||
        (GetAverageKeyframeDistanceSec() < 10));
   EXPECT_EQ(matches_requirements, IsBackgroundOptimizationCandidate());
 
   // Video is always paused when suspension is on and only if matches the
   // optimization criteria if the optimization is on.
-#if defined(OS_ANDROID)
   bool should_pause = IsMediaSuspendOn() ||
                       (IsBackgroundOptimizationOn() && matches_requirements);
   EXPECT_EQ(should_pause, ShouldPauseVideoWhenHidden());
-#else
-  // TODO(avayvod): Revert after merging into 58 so we keep getting data on the
-  // background video pause behavior on desktop. See https://crbug.com/699106.
-  EXPECT_FALSE(ShouldPauseVideoWhenHidden());
-#endif
 }
 
 TEST_P(WebMediaPlayerImplBackgroundBehaviorTest, AudioVideo) {
   SetMetadata(true, true);
 
   // Optimization requirements are the same for all platforms.
   bool matches_requirements =
       (GetDurationSec() < GetAverageKeyframeDistanceSec()) ||
       (GetAverageKeyframeDistanceSec() < 10);
 
   EXPECT_EQ(matches_requirements, IsBackgroundOptimizationCandidate());
   EXPECT_EQ(IsBackgroundOptimizationOn() && matches_requirements,
             ShouldDisableVideoWhenHidden());
 
-// Only pause audible videos if both media suspend and resume
-// background videos is on.
-#if defined(OS_ANDROID)
+  // Only pause audible videos on Android if both media suspend and resume
+  // background videos is on. On Desktop
   EXPECT_EQ(IsMediaSuspendOn() && IsResumeBackgroundVideoEnabled(),
             ShouldPauseVideoWhenHidden());
-#else
-  // TODO(avayvod): Revert after merging into 58 so we keep getting data on the
-  // background video pause behavior on desktop. See https://crbug.com/699106.
-  EXPECT_FALSE(ShouldPauseVideoWhenHidden());
-#endif
 }
 
 INSTANTIATE_TEST_CASE_P(BackgroundBehaviorTestInstances,
                         WebMediaPlayerImplBackgroundBehaviorTest,
                         ::testing::Combine(::testing::Bool(),
                                            ::testing::Bool(),
                                            ::testing::Values(5, 300),
                                            ::testing::Values(5, 100),
                                            ::testing::Bool()));
 
 }  // namespace media