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

content/renderer/media/renderer_webmediaplayer_delegate.cc

Index: content/renderer/media/renderer_webmediaplayer_delegate.cc
diff --git a/content/renderer/media/renderer_webmediaplayer_delegate.cc b/content/renderer/media/renderer_webmediaplayer_delegate.cc
index 92d1140e8a6c52c2500f4daa21383717f482f37d..b14680333599a7271ba96a73630a64df7a466fff 100644
--- a/content/renderer/media/renderer_webmediaplayer_delegate.cc
+++ b/content/renderer/media/renderer_webmediaplayer_delegate.cc
@@ -61,11 +61,6 @@ 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);
 }
@@ -180,7 +175,6 @@ void RendererWebMediaPlayerDelegate::WasHidden() {
 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();
@@ -221,12 +215,7 @@ 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();
 }
@@ -235,23 +224,16 @@ 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() {