Split MediaContentType and AudioFocusType

content/browser/media/session/media_session_controllers_manager.cc

Index: content/browser/media/session/media_session_controllers_manager.cc
diff --git a/content/browser/media/session/media_session_controllers_manager.cc b/content/browser/media/session/media_session_controllers_manager.cc
index 426f3ceb325e1b6c9aa79534501aecc026cfc51c..f0cf9d439668326ea5b62de0899c96033ca29c1c 100644
--- a/content/browser/media/session/media_session_controllers_manager.cc
+++ b/content/browser/media/session/media_session_controllers_manager.cc
@@ -45,8 +45,11 @@ void MediaSessionControllersManager::RenderFrameDeleted(
   }
 }
 
-bool MediaSessionControllersManager::RequestPlay(const MediaPlayerId& id,
-    bool has_audio, bool is_remote, base::TimeDelta duration) {
+bool MediaSessionControllersManager::RequestPlay(
+    const MediaPlayerId& id,
+    bool has_audio,
+    bool is_remote,
+    media::MediaContentType media_content_type) {
   if (!IsDefaultMediaSessionEnabled())
     return true;
 
@@ -58,7 +61,7 @@ bool MediaSessionControllersManager::RequestPlay(const MediaPlayerId& id,
   // controller. A later playback attempt will create a new controller.
   auto it = controllers_map_.find(id);
   if (it != controllers_map_.end()) {
-    if (it->second->Initialize(has_audio, is_remote, duration))
+    if (it->second->Initialize(has_audio, is_remote, media_content_type))
       return true;
     controllers_map_.erase(it);
     return false;
@@ -67,7 +70,7 @@ bool MediaSessionControllersManager::RequestPlay(const MediaPlayerId& id,
   std::unique_ptr<MediaSessionController> controller(
       new MediaSessionController(id, media_web_contents_observer_));
 
-  if (!controller->Initialize(has_audio, is_remote, duration))
+  if (!controller->Initialize(has_audio, is_remote, media_content_type))
     return false;
 
   controllers_map_[id] = std::move(controller);