Refactor WebMediaPlayerDelegate interface.

content/renderer/media/webmediaplayer_ms.cc

Index: content/renderer/media/webmediaplayer_ms.cc
diff --git a/content/renderer/media/webmediaplayer_ms.cc b/content/renderer/media/webmediaplayer_ms.cc
index 4ecb72e3d854c0a8dc946e66aa60ed94987f7a32..4d69d513a49f14389e56cc87dbc3906d83b93bce 100644
--- a/content/renderer/media/webmediaplayer_ms.cc
+++ b/content/renderer/media/webmediaplayer_ms.cc
@@ -300,7 +300,7 @@ void WebMediaPlayerMS::play() {
     // TODO(perkj, magjed): We use OneShot focus type here so that it takes
     // audio focus once it starts, and then will not respond to further audio
     // focus changes. See http://crbug.com/596516 for more details.
-    delegate_->DidPlay(delegate_id_, hasVideo(), hasAudio(), false,
+    delegate_->DidPlay(delegate_id_, hasAudio(), hasVideo(),
                        media::MediaContentType::OneShot);
   }
 
@@ -325,8 +325,10 @@ void WebMediaPlayerMS::pause() {
   if (audio_renderer_)
     audio_renderer_->Pause();
 
-  if (delegate_)
-    delegate_->DidPause(delegate_id_, false);
+  if (delegate_) {
+    delegate_->DidPause(delegate_id_);
+    delegate_->SetIdle(delegate_id_, true);
+  }
 
   paused_ = true;
 }
@@ -508,7 +510,7 @@ size_t WebMediaPlayerMS::videoDecodedByteCount() const {
   return 0;
 }
 
-void WebMediaPlayerMS::OnHidden() {
+void WebMediaPlayerMS::OnFrameHidden() {
 #if defined(OS_ANDROID)
   DCHECK(thread_checker_.CalledOnValidThread());
 
@@ -529,41 +531,41 @@ void WebMediaPlayerMS::OnHidden() {
 #endif  // defined(OS_ANDROID)
 }
 
-void WebMediaPlayerMS::OnShown() {
+void WebMediaPlayerMS::OnFrameClosed() {
 #if defined(OS_ANDROID)
-  DCHECK(thread_checker_.CalledOnValidThread());
+  if (!paused_) {
+    pause();
+    should_play_upon_shown_ = true;
+  }
+
+  if (delegate_)
+    delegate_->PlayerGone(delegate_id_);
 
   if (frame_deliverer_) {
     compositor_task_runner_->PostTask(
         FROM_HERE, base::Bind(&FrameDeliverer::SetRenderFrameSuspended,
-                              base::Unretained(frame_deliverer_.get()), false));
+                              base::Unretained(frame_deliverer_.get()), true));
   }
-
-  // Resume playback on visibility. play() clears |should_play_upon_shown_|.
-  if (should_play_upon_shown_)
-    play();
 #endif  // defined(OS_ANDROID)
 }
 
-bool WebMediaPlayerMS::OnSuspendRequested(bool must_suspend) {
+void WebMediaPlayerMS::OnFrameShown() {
 #if defined(OS_ANDROID)
-  if (!must_suspend)
-    return false;
-
-  if (!paused_) {
-    pause();
-    should_play_upon_shown_ = true;
-  }
-
-  if (delegate_)
-    delegate_->PlayerGone(delegate_id_);
+  DCHECK(thread_checker_.CalledOnValidThread());
 
   if (frame_deliverer_) {
     compositor_task_runner_->PostTask(
         FROM_HERE, base::Bind(&FrameDeliverer::SetRenderFrameSuspended,
-                              base::Unretained(frame_deliverer_.get()), true));
+                              base::Unretained(frame_deliverer_.get()), false));
   }
+
+  // Resume playback on visibility. play() clears |should_play_upon_shown_|.
+  if (should_play_upon_shown_)
+    play();
 #endif  // defined(OS_ANDROID)
+}
+
+bool WebMediaPlayerMS::OnIdleTimeout() {
   return true;
 }