Implement MediaSession on top of the WebMediaPlayerDelegate.

content/browser/web_contents/web_contents_impl_unittest.cc

Index: content/browser/web_contents/web_contents_impl_unittest.cc
diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc
index fef8e5bbc09cd04591c9fa5618ae454015474e38..5464042094821e5d93ca97ed05469898b28d9013 100644
--- a/content/browser/web_contents/web_contents_impl_unittest.cc
+++ b/content/browser/web_contents/web_contents_impl_unittest.cc
@@ -23,6 +23,7 @@
 #include "content/browser/webui/web_ui_controller_factory_registry.h"
 #include "content/common/frame_messages.h"
 #include "content/common/input/synthetic_web_input_event_builders.h"
+#include "content/common/media/media_player_delegate_messages.h"
 #include "content/common/site_isolation_policy.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/global_request_id.h"
@@ -3199,9 +3200,7 @@ TEST_F(WebContentsImplTest, NoEarlyStop) {
 }
 
 TEST_F(WebContentsImplTest, MediaPowerSaveBlocking) {
-  // PlayerIDs are actually pointers cast to int64_t, so verify that both
-  // negative
-  // and positive player ids don't blow up.
+  // Verify that both negative and positive player ids don't blow up.
   const int kPlayerAudioVideoId = 15;
   const int kPlayerAudioOnlyId = -15;
   const int kPlayerVideoOnlyId = 30;
@@ -3235,8 +3234,8 @@ TEST_F(WebContentsImplTest, MediaPowerSaveBlocking) {
   // Start a player with both audio and video.  A video power save blocker
   // should be created.  If audio stream monitoring is available, an audio power
   // save blocker should be created too.
-  rfh->OnMessageReceived(FrameHostMsg_MediaPlayingNotification(
-      0, kPlayerAudioVideoId, true, true, false));
+  rfh->OnMessageReceived(MediaPlayerDelegateHostMsg_OnMediaPlaying(
+      0, kPlayerAudioVideoId, true, true, false, base::TimeDelta()));
   EXPECT_TRUE(has_video_power_save_blocker());
   EXPECT_EQ(has_audio_power_save_blocker(),
             !AudioStreamMonitor::monitoring_available());
@@ -3248,8 +3247,8 @@ TEST_F(WebContentsImplTest, MediaPowerSaveBlocking) {
   // Start another player that only has video.  There should be no change in
   // the power save blockers.  The notification should take into account the
   // visibility state of the WebContents.
-  rfh->OnMessageReceived(FrameHostMsg_MediaPlayingNotification(
-      0, kPlayerVideoOnlyId, true, false, false));
+  rfh->OnMessageReceived(MediaPlayerDelegateHostMsg_OnMediaPlaying(
+      0, kPlayerVideoOnlyId, true, false, false, base::TimeDelta()));
   EXPECT_FALSE(has_video_power_save_blocker());
   EXPECT_EQ(has_audio_power_save_blocker(),
             !AudioStreamMonitor::monitoring_available());
@@ -3260,16 +3259,16 @@ TEST_F(WebContentsImplTest, MediaPowerSaveBlocking) {
 
   // Start another player that only has audio.  There should be no change in
   // the power save blockers.
-  rfh->OnMessageReceived(FrameHostMsg_MediaPlayingNotification(
-      0, kPlayerAudioOnlyId, false, true, false));
+  rfh->OnMessageReceived(MediaPlayerDelegateHostMsg_OnMediaPlaying(
+      0, kPlayerAudioOnlyId, false, true, false, base::TimeDelta()));
   EXPECT_TRUE(has_video_power_save_blocker());
   EXPECT_EQ(has_audio_power_save_blocker(),
             !AudioStreamMonitor::monitoring_available());
 
   // Start a remote player. There should be no change in the power save
   // blockers.
-  rfh->OnMessageReceived(FrameHostMsg_MediaPlayingNotification(
-      0, kPlayerRemoteId, true, true, true));
+  rfh->OnMessageReceived(MediaPlayerDelegateHostMsg_OnMediaPlaying(
+      0, kPlayerRemoteId, true, true, true, base::TimeDelta()));
   EXPECT_TRUE(has_video_power_save_blocker());
   EXPECT_EQ(has_audio_power_save_blocker(),
             !AudioStreamMonitor::monitoring_available());
@@ -3277,34 +3276,34 @@ TEST_F(WebContentsImplTest, MediaPowerSaveBlocking) {
   // Destroy the original audio video player.  Both power save blockers should
   // remain.
   rfh->OnMessageReceived(
-      FrameHostMsg_MediaPausedNotification(0, kPlayerAudioVideoId));
+      MediaPlayerDelegateHostMsg_OnMediaPaused(0, kPlayerAudioVideoId, false));
   EXPECT_TRUE(has_video_power_save_blocker());
   EXPECT_EQ(has_audio_power_save_blocker(),
             !AudioStreamMonitor::monitoring_available());
 
   // Destroy the audio only player.  The video power save blocker should remain.
   rfh->OnMessageReceived(
-      FrameHostMsg_MediaPausedNotification(0, kPlayerAudioOnlyId));
+      MediaPlayerDelegateHostMsg_OnMediaPaused(0, kPlayerAudioOnlyId, false));
   EXPECT_TRUE(has_video_power_save_blocker());
   EXPECT_FALSE(has_audio_power_save_blocker());
 
   // Destroy the video only player.  No power save blockers should remain.
   rfh->OnMessageReceived(
-      FrameHostMsg_MediaPausedNotification(0, kPlayerVideoOnlyId));
+      MediaPlayerDelegateHostMsg_OnMediaPaused(0, kPlayerVideoOnlyId, false));
   EXPECT_FALSE(has_video_power_save_blocker());
   EXPECT_FALSE(has_audio_power_save_blocker());
 
   // Destroy the remote player. No power save blockers should remain.
   rfh->OnMessageReceived(
-      FrameHostMsg_MediaPausedNotification(0, kPlayerRemoteId));
+      MediaPlayerDelegateHostMsg_OnMediaPaused(0, kPlayerRemoteId, false));
   EXPECT_FALSE(has_video_power_save_blocker());
   EXPECT_FALSE(has_audio_power_save_blocker());
 
   // Start a player with both audio and video.  A video power save blocker
   // should be created.  If audio stream monitoring is available, an audio power
   // save blocker should be created too.
-  rfh->OnMessageReceived(FrameHostMsg_MediaPlayingNotification(
-      0, kPlayerAudioVideoId, true, true, false));
+  rfh->OnMessageReceived(MediaPlayerDelegateHostMsg_OnMediaPlaying(
+      0, kPlayerAudioVideoId, true, true, false, base::TimeDelta()));
   EXPECT_TRUE(has_video_power_save_blocker());
   EXPECT_EQ(has_audio_power_save_blocker(),
             !AudioStreamMonitor::monitoring_available());