Split MediaContentType and AudioFocusType

content/browser/media/session/media_session_controller_unittest.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 "content/browser/media/media_web_contents_observer.h"
 #include "content/browser/media/session/media_session.h"
 #include "content/browser/media/session/media_session_controller.h"
 #include "content/common/media/media_player_delegate_messages.h"
@@ skipping 34 matching lines @@
 
   void Resume() {
     controller_->OnResume(controller_->get_player_id_for_testing());
   }
 
   void SetVolumeMultiplier(double multiplier) {
     controller_->OnSetVolumeMultiplier(controller_->get_player_id_for_testing(),
                                        multiplier);
   }
 
-  // Returns a duration long enough for a media session instance to be created.
-  base::TimeDelta DurationJustRight() {
-    return base::TimeDelta::FromSeconds(
-        MediaSessionController::kMinimumDurationForContentSecs + 1);
-  }
-
-  // Returns a duration too short for a media session instance.
-  base::TimeDelta DurationTooShort() {
-    return base::TimeDelta::FromSeconds(
-        MediaSessionController::kMinimumDurationForContentSecs);
-  }
-
   template <typename T>
   bool ReceivedMessagePlayPause() {
     const IPC::Message* msg = test_sink().GetUniqueMessageMatching(T::ID);
     if (!msg)
       return false;
 
     std::tuple<int> result;
     if (!T::Read(msg, &result))
       return false;
 
@@ skipping 19 matching lines @@
     EXPECT_EQ(expected_multiplier, std::get<1>(result));
     test_sink().ClearMessages();
     return expected_multiplier == std::get<1>(result);
   }
 
   WebContentsObserver::MediaPlayerId id_;
   std::unique_ptr<MediaSessionController> controller_;
 };
 
 TEST_F(MediaSessionControllerTest, NoAudioNoSession) {
-  ASSERT_TRUE(controller_->Initialize(false, false, DurationJustRight()));
+  ASSERT_TRUE(controller_->Initialize(false, false,
+                                      media::MediaContentType::Persistent));
   EXPECT_TRUE(media_session()->IsSuspended());
   EXPECT_FALSE(media_session()->IsControllable());
 }
 
 TEST_F(MediaSessionControllerTest, IsRemoteNoSession) {
-  ASSERT_TRUE(controller_->Initialize(true, true, DurationJustRight()));
+  ASSERT_TRUE(
+      controller_->Initialize(true, true, media::MediaContentType::Persistent));
   EXPECT_TRUE(media_session()->IsSuspended());
   EXPECT_FALSE(media_session()->IsControllable());
 }
 
-TEST_F(MediaSessionControllerTest, TooShortNoControllableSession) {
-  ASSERT_TRUE(controller_->Initialize(true, false, DurationTooShort()));
+TEST_F(MediaSessionControllerTest, TransientNoControllableSession) {
+  ASSERT_TRUE(
+      controller_->Initialize(true, false, media::MediaContentType::Transient));
   EXPECT_FALSE(media_session()->IsSuspended());
   EXPECT_FALSE(media_session()->IsControllable());
 }
 
 TEST_F(MediaSessionControllerTest, BasicControls) {
-  ASSERT_TRUE(controller_->Initialize(true, false, DurationJustRight()));
+  ASSERT_TRUE(controller_->Initialize(true, false,
+                                      media::MediaContentType::Persistent));
   EXPECT_FALSE(media_session()->IsSuspended());
   EXPECT_TRUE(media_session()->IsControllable());
 
   // Verify suspend notifies the renderer and maintains its session.
   Suspend();
   EXPECT_TRUE(ReceivedMessagePlayPause<MediaPlayerDelegateMsg_Pause>());
 
   // Likewise verify the resume behavior.
   Resume();
   EXPECT_TRUE(ReceivedMessagePlayPause<MediaPlayerDelegateMsg_Play>());
 
   // Verify destruction of the controller removes its session.
   controller_.reset();
   EXPECT_TRUE(media_session()->IsSuspended());
   EXPECT_FALSE(media_session()->IsControllable());
 }
 
 TEST_F(MediaSessionControllerTest, VolumeMultiplier) {
-  ASSERT_TRUE(controller_->Initialize(true, false, DurationJustRight()));
+  ASSERT_TRUE(controller_->Initialize(true, false,
+                                      media::MediaContentType::Persistent));
   EXPECT_FALSE(media_session()->IsSuspended());
   EXPECT_TRUE(media_session()->IsControllable());
 
   // Upon creation of the MediaSession the default multiplier will be sent.
   EXPECT_TRUE(ReceivedMessageVolumeMultiplierUpdate<
               MediaPlayerDelegateMsg_UpdateVolumeMultiplier>(1.0));
 
   // Verify a different volume multiplier is sent.
   const double kTestMultiplier = 0.5;
   SetVolumeMultiplier(kTestMultiplier);
   EXPECT_TRUE(ReceivedMessageVolumeMultiplierUpdate<
               MediaPlayerDelegateMsg_UpdateVolumeMultiplier>(kTestMultiplier));
 }
 
 TEST_F(MediaSessionControllerTest, ControllerSidePause) {
-  ASSERT_TRUE(controller_->Initialize(true, false, DurationJustRight()));
+  ASSERT_TRUE(controller_->Initialize(true, false,
+                                      media::MediaContentType::Persistent));
   EXPECT_FALSE(media_session()->IsSuspended());
   EXPECT_TRUE(media_session()->IsControllable());
 
   // Verify pause behavior.
   controller_->OnPlaybackPaused();
   EXPECT_TRUE(media_session()->IsSuspended());
   EXPECT_TRUE(media_session()->IsControllable());
 
   // Verify the next Initialize() call restores the session.
-  ASSERT_TRUE(controller_->Initialize(true, false, DurationJustRight()));
+  ASSERT_TRUE(controller_->Initialize(true, false,
+                                      media::MediaContentType::Persistent));
   EXPECT_FALSE(media_session()->IsSuspended());
   EXPECT_TRUE(media_session()->IsControllable());
 }
 
 TEST_F(MediaSessionControllerTest, Reinitialize) {
-  ASSERT_TRUE(controller_->Initialize(false, false, DurationJustRight()));
+  ASSERT_TRUE(controller_->Initialize(false, false,
+                                      media::MediaContentType::Persistent));
   EXPECT_TRUE(media_session()->IsSuspended());
   EXPECT_FALSE(media_session()->IsControllable());
 
   // Create a transient type session.
-  ASSERT_TRUE(controller_->Initialize(true, false, DurationTooShort()));
+  ASSERT_TRUE(
+      controller_->Initialize(true, false, media::MediaContentType::Transient));
   EXPECT_FALSE(media_session()->IsSuspended());
   EXPECT_FALSE(media_session()->IsControllable());
   const int current_player_id = controller_->get_player_id_for_testing();
 
   // Reinitialize the session as a content type.
-  ASSERT_TRUE(controller_->Initialize(true, false, DurationJustRight()));
+  ASSERT_TRUE(controller_->Initialize(true, false,
+                                      media::MediaContentType::Persistent));
   EXPECT_FALSE(media_session()->IsSuspended());
   EXPECT_TRUE(media_session()->IsControllable());
   // Player id should not change when there's an active session.
   EXPECT_EQ(current_player_id, controller_->get_player_id_for_testing());
 
   // Verify suspend notifies the renderer and maintains its session.
   Suspend();
   EXPECT_TRUE(ReceivedMessagePlayPause<MediaPlayerDelegateMsg_Pause>());
 
   // Likewise verify the resume behavior.
   Resume();
   EXPECT_TRUE(ReceivedMessagePlayPause<MediaPlayerDelegateMsg_Play>());
 
   // Attempt to switch to no audio player, which should do nothing.
   // TODO(dalecurtis): Delete this test once we're no longer using WMPA and
   // the BrowserMediaPlayerManagers.  Tracked by http://crbug.com/580626
-  ASSERT_TRUE(controller_->Initialize(false, false, DurationJustRight()));
+  ASSERT_TRUE(controller_->Initialize(false, false,
+                                      media::MediaContentType::Persistent));
   EXPECT_FALSE(media_session()->IsSuspended());
   EXPECT_TRUE(media_session()->IsControllable());
   EXPECT_EQ(current_player_id, controller_->get_player_id_for_testing());
 
   // Switch to a remote player, which should release the session.
-  ASSERT_TRUE(controller_->Initialize(true, true, DurationJustRight()));
+  ASSERT_TRUE(
+      controller_->Initialize(true, true, media::MediaContentType::Persistent));
   EXPECT_TRUE(media_session()->IsSuspended());
   EXPECT_FALSE(media_session()->IsControllable());
   EXPECT_EQ(current_player_id, controller_->get_player_id_for_testing());
 }
 
 }  // namespace content