Split MediaContentType and AudioFocusType

content/browser/media/session/media_session_controller.cc

Index: content/browser/media/session/media_session_controller.cc
diff --git a/content/browser/media/session/media_session_controller.cc b/content/browser/media/session/media_session_controller.cc
index 7d6638872602b564d23d34bf4f81a85f2035a286..029e24da527365198ba173e731fdf5510728ab07 100644
--- a/content/browser/media/session/media_session_controller.cc
+++ b/content/browser/media/session/media_session_controller.cc
@@ -9,6 +9,7 @@
 #include "content/common/media/media_player_delegate_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
+#include "media/base/media_content_type.h"
 
 namespace content {
 
@@ -26,9 +27,10 @@ MediaSessionController::~MediaSessionController() {
   media_session_->RemovePlayer(this, player_id_);
 }
 
-bool MediaSessionController::Initialize(bool has_audio,
-                                        bool is_remote,
-                                        base::TimeDelta duration) {
+bool MediaSessionController::Initialize(
+    bool has_audio,
+    bool is_remote,
+    media::MediaContentType media_content_type) {
   // Don't generate a new id if one has already been set.
   if (!has_session_) {
     // These objects are only created on the UI thread, so this is safe.
@@ -60,16 +62,10 @@ bool MediaSessionController::Initialize(bool has_audio,
     return true;
   }
 
-  const MediaSession::Type media_session_type =
-      (duration.is_zero() ||
-       duration > base::TimeDelta::FromSeconds(kMinimumDurationForContentSecs))
-          ? MediaSession::Type::Content
-          : MediaSession::Type::Transient;
-
   // If a session can't be created, force a pause immediately.  Attempt to add a
   // session even if we already have one.  MediaSession expects AddPlayer() to
   // be called after OnPlaybackPaused() to reactivate the session.
-  if (!media_session_->AddPlayer(this, player_id_, media_session_type)) {
+  if (!media_session_->AddPlayer(this, player_id_, media_content_type)) {
     OnSuspend(player_id_);
     return false;
   }