Split MediaContentType and AudioFocusType

content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc

Index: content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc
diff --git a/content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc b/content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc
index 4fe4fdb45256ea6afa9443ab639371b3312825e5..c7c8e3f4e94b58bc191efd2ca8c1143a3f3b4960 100644
--- a/content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc
+++ b/content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc
@@ -74,21 +74,22 @@ TEST_F(RendererWebMediaPlayerDelegateTest, SendsMessagesCorrectly) {
   // Verify the playing message.
   {
     const bool kHasVideo = true, kHasAudio = false, kIsRemote = false;
-    const base::TimeDelta kDuration = base::TimeDelta::FromSeconds(5);
+    const media::MediaContentType kMediaContentType =
+        media::MediaContentType::Transient;
     delegate_manager_->DidPlay(delegate_id, kHasVideo, kHasAudio, kIsRemote,
-                               kDuration);
+                               kMediaContentType);
 
     const IPC::Message* msg = test_sink().GetUniqueMessageMatching(
         MediaPlayerDelegateHostMsg_OnMediaPlaying::ID);
     ASSERT_TRUE(msg);
 
-    std::tuple<int, bool, bool, bool, base::TimeDelta> result;
+    std::tuple<int, bool, bool, bool, media::MediaContentType> result;
     ASSERT_TRUE(MediaPlayerDelegateHostMsg_OnMediaPlaying::Read(msg, &result));
     EXPECT_EQ(delegate_id, std::get<0>(result));
     EXPECT_EQ(kHasVideo, std::get<1>(result));
     EXPECT_EQ(kHasAudio, std::get<2>(result));
     EXPECT_EQ(kIsRemote, std::get<3>(result));
-    EXPECT_EQ(kDuration, std::get<4>(result));
+    EXPECT_EQ(kMediaContentType, std::get<4>(result));
   }
 
   // Verify the paused message.
@@ -171,7 +172,7 @@ TEST_F(RendererWebMediaPlayerDelegateTest, IdleDelegatesAreSuspended) {
 
   // Starting playback should not have an idle timer.
   delegate_manager_->DidPlay(delegate_id_1, true, true, false,
-                             base::TimeDelta());
+                             media::MediaContentType::Transient);
   EXPECT_FALSE(delegate_manager_->IsIdleCleanupTimerRunningForTesting());
 
   // Never calling DidPlay() but calling DidPause() should count as idle.
@@ -200,7 +201,7 @@ TEST_F(RendererWebMediaPlayerDelegateTest, IdleDelegatesAreSuspended) {
   testing::StrictMock<MockWebMediaPlayerDelegateObserver> observer_3;
   const int delegate_id_3 = delegate_manager_->AddObserver(&observer_3);
   delegate_manager_->DidPlay(delegate_id_3, true, true, false,
-                             base::TimeDelta());
+                             media::MediaContentType::Transient);
 
   // Adding the observer should instantly queue the timeout task, once run no
   // delegates should have been expired.
@@ -215,7 +216,7 @@ TEST_F(RendererWebMediaPlayerDelegateTest, IdleDelegatesAreSuspended) {
   }
 
   delegate_manager_->DidPlay(delegate_id_1, true, true, false,
-                             base::TimeDelta());
+                             media::MediaContentType::Transient);
 
   // Pausing after reaching end of stream should count as idle.
   delegate_manager_->DidPause(delegate_id_1, true /* reached_end_of_stream */);