[Video] MediaSession API event handlers can resume background video.

content/renderer/media/renderer_webmediaplayer_delegate.cc

 // Copyright 2015 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 "content/renderer/media/renderer_webmediaplayer_delegate.h"
 
 #include <stdint.h>
 
 #include "base/auto_reset.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 43 matching lines @@
   if (is_frame_hidden_for_testing_)
     return true;
 
   return (render_frame() && render_frame()->IsHidden()) || is_frame_closed_;
 }
 
 bool RendererWebMediaPlayerDelegate::IsFrameClosed() {
   return is_frame_closed_;
 }
 
-bool RendererWebMediaPlayerDelegate::IsBackgroundVideoPlaybackUnlocked() {
-  // TODO(sandersd): Include a check for kResumeBackgroundVideo?
-  return background_video_allowed_;
-}
-
 int RendererWebMediaPlayerDelegate::AddObserver(Observer* observer) {
   return id_map_.Add(observer);
 }
 
 void RendererWebMediaPlayerDelegate::RemoveObserver(int player_id) {
   DCHECK(id_map_.Lookup(player_id));
   id_map_.Remove(player_id);
   idle_player_map_.erase(player_id);
   stale_players_.erase(player_id);
   playing_videos_.erase(player_id);
@@ skipping 94 matching lines @@
 
   for (IDMap<Observer*>::iterator it(&id_map_); !it.IsAtEnd(); it.Advance())
     it.GetCurrentValue()->OnFrameHidden();
 
   ScheduleUpdateTask();
 }
 
 void RendererWebMediaPlayerDelegate::WasShown() {
   RecordAction(base::UserMetricsAction("Media.Shown"));
   is_frame_closed_ = false;
-  background_video_allowed_ = false;
 
   for (IDMap<Observer*>::iterator it(&id_map_); !it.IsAtEnd(); it.Advance())
     it.GetCurrentValue()->OnFrameShown();
 
   ScheduleUpdateTask();
 }
 
 bool RendererWebMediaPlayerDelegate::OnMessageReceived(
     const IPC::Message& msg) {
   IPC_BEGIN_MESSAGE_MAP(RendererWebMediaPlayerDelegate, msg)
@@ skipping 20 matching lines @@
 
 bool RendererWebMediaPlayerDelegate::IsIdleCleanupTimerRunningForTesting()
     const {
   return idle_cleanup_timer_.IsRunning();
 }
 
 void RendererWebMediaPlayerDelegate::SetFrameHiddenForTesting(bool is_hidden) {
   if (is_hidden == is_frame_hidden_for_testing_)
     return;
 
-  if (is_hidden) {
-    is_frame_hidden_for_testing_ = true;
-  } else {
-    is_frame_hidden_for_testing_ = false;
-    background_video_allowed_ = false;
-  }
+  is_frame_hidden_for_testing_ = is_hidden;
 
   ScheduleUpdateTask();
 }
 
 void RendererWebMediaPlayerDelegate::OnMediaDelegatePause(int player_id) {
   RecordAction(base::UserMetricsAction("Media.Controls.RemotePause"));
 
   Observer* observer = id_map_.Lookup(player_id);
-  if (observer) {
-    background_video_allowed_ = false;
+  if (observer)
     observer->OnPause();
-  }
 }
 
 void RendererWebMediaPlayerDelegate::OnMediaDelegatePlay(int player_id) {
   RecordAction(base::UserMetricsAction("Media.Controls.RemotePlay"));
 
   Observer* observer = id_map_.Lookup(player_id);
-  if (observer) {
-    // TODO(sandersd): Ideally we would only set the flag if the player has
-    // video, but we don't reliably know if a paused player has video.
-    if (IsFrameHidden() && !IsFrameClosed())
-      background_video_allowed_ = true;
+  if (observer)
     observer->OnPlay();
-  }
 }
 
 void RendererWebMediaPlayerDelegate::OnMediaDelegateSuspendAllMediaPlayers() {
   is_frame_closed_ = true;
 
   for (IDMap<Observer*>::iterator it(&id_map_); !it.IsAtEnd(); it.Advance())
     it.GetCurrentValue()->OnFrameClosed();
 }
 
 void RendererWebMediaPlayerDelegate::OnMediaDelegateVolumeMultiplierUpdate(
@@ skipping 99 matching lines @@
       player->OnIdleTimeout();
     }
   }
 }
 
 void RendererWebMediaPlayerDelegate::OnDestruct() {
   delete this;
 }
 
 }  // namespace media