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

media/blink/webmediaplayer_impl.cc

 // Copyright 2013 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 <algorithm>
 #include <cmath>
 #include <limits>
 #include <string>
@@ skipping 2135 matching lines @@
 bool WebMediaPlayerImpl::DoesOverlaySupportMetadata() const {
   return pipeline_metadata_.video_rotation == VIDEO_ROTATION_0;
 }
 
 void WebMediaPlayerImpl::ActivateViewportIntersectionMonitoring(bool activate) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
   client_->activateViewportIntersectionMonitoring(activate);
 }
 
-// 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.
-#if !defined(OS_ANDROID)
-
-bool WebMediaPlayerImpl::ShouldPauseVideoWhenHidden() const {
-  return false;
-}
-
-#else  // !defined(OS_ANDROID)
-
 bool WebMediaPlayerImpl::ShouldPauseVideoWhenHidden() const {
   // If suspending background video, pause any video that's not remoted or
   // not unlocked to play in the background.
   if (IsBackgroundedSuspendEnabled()) {
     if (!hasVideo())
       return false;
 
 #if defined(OS_ANDROID)
     if (isRemote())
       return false;
 #endif
 
     return !hasAudio() ||
            (IsResumeBackgroundVideosEnabled() &&
             video_locked_when_paused_when_hidden_);
   }
 
   // Otherwise only pause if the optimization is on and it's a video-only
   // optimization candidate.
   return IsBackgroundVideoTrackOptimizationEnabled() && !hasAudio() &&
          IsBackgroundOptimizationCandidate();
 }
 
-#endif  // !defined(OS_ANDROID)
-
 bool WebMediaPlayerImpl::ShouldDisableVideoWhenHidden() const {
   // This optimization is behind the flag on all platforms.
   if (!IsBackgroundVideoTrackOptimizationEnabled())
     return false;
 
   // Disable video track only for players with audio that match the criteria for
   // being optimized.
   return hasAudio() && IsBackgroundOptimizationCandidate();
 }
 
@@ skipping 126 matching lines @@
 
 void WebMediaPlayerImpl::RecordUnderflowDuration(base::TimeDelta duration) {
   DCHECK(data_source_ || chunk_demuxer_);
   if (data_source_)
     UMA_HISTOGRAM_TIMES("Media.UnderflowDuration", duration);
   else
     UMA_HISTOGRAM_TIMES("Media.UnderflowDuration.MSE", duration);
 }
 
 }  // namespace media