Split MediaContentType and AudioFocusType

content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc

 // Copyright 2016 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 <tuple>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/run_loop.h"
@@ skipping 73 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(RendererWebMediaPlayerDelegateTest);
 };
 
 TEST_F(RendererWebMediaPlayerDelegateTest, SendsMessagesCorrectly) {
   testing::StrictMock<MockWebMediaPlayerDelegateObserver> observer;
   const int delegate_id = delegate_manager_->AddObserver(&observer);
 
   // 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.
   {
     test_sink().ClearMessages();
     const bool kReachedEndOfStream = true;
     delegate_manager_->DidPause(delegate_id, kReachedEndOfStream);
 
     const IPC::Message* msg = test_sink().GetUniqueMessageMatching(
         MediaPlayerDelegateHostMsg_OnMediaPaused::ID);
@@ skipping 62 matching lines @@
   delegate_manager_->SetIdleCleanupParamsForTesting(kIdleTimeout, &tick_clock);
   EXPECT_FALSE(delegate_manager_->IsIdleCleanupTimerRunningForTesting());
 
   // Just adding an observer should not start the idle timer.
   testing::StrictMock<MockWebMediaPlayerDelegateObserver> observer_1;
   const int delegate_id_1 = delegate_manager_->AddObserver(&observer_1);
   EXPECT_FALSE(delegate_manager_->IsIdleCleanupTimerRunningForTesting());
 
   // 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.
   testing::StrictMock<MockWebMediaPlayerDelegateObserver> observer_2;
   const int delegate_id_2 = delegate_manager_->AddObserver(&observer_2);
   delegate_manager_->DidPause(delegate_id_2, false);
   EXPECT_TRUE(delegate_manager_->IsIdleCleanupTimerRunningForTesting());
 
   // Adding the observer should instantly queue the timeout task, once run the
   // second delegate should be expired while the first is kept alive.
   {
     EXPECT_CALL(observer_2, OnSuspendRequested(false))
         .WillOnce(RunClosure(base::Bind(
             &RendererWebMediaPlayerDelegate::PlayerGone,
             base::Unretained(delegate_manager_.get()), delegate_id_2)));
     base::RunLoop run_loop;
     base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
                                                   run_loop.QuitClosure());
     tick_clock.Advance(kIdleTimeout + base::TimeDelta::FromMicroseconds(1));
     run_loop.Run();
   }
 
   // Pausing should count as idle if playback didn't reach end of stream, but
   // in this case the player will not remove the MediaSession.
   delegate_manager_->DidPause(delegate_id_1, false /* reached_end_of_stream */);
   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.
   {
     EXPECT_CALL(observer_1, OnSuspendRequested(false))
         .Times(testing::AtLeast(1));
     base::RunLoop run_loop;
     base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
                                                   run_loop.QuitClosure());
     tick_clock.Advance(kIdleTimeout + base::TimeDelta::FromMicroseconds(1));
     run_loop.Run();
   }
 
   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 */);
 
   // Once the timeout task runs the first delegate should be expired while the
   // third is kept alive.
   {
     EXPECT_CALL(observer_1, OnSuspendRequested(false))
         .WillOnce(RunClosure(base::Bind(
             &RendererWebMediaPlayerDelegate::PlayerGone,
@@ skipping 152 matching lines @@
   delegate_manager_->DidPlay(
       delegate_id, true, true, false, base::TimeDelta());
   SetPlayingBackgroundVideo(true);
   delegate_manager_->WasShown();
   histogram_tester.ExpectTotalCount("Media.Android.BackgroundVideoTime", 2);
 }
 
 #endif  // OS_ANDROID
 
 }  // namespace media