Split MediaContentType and AudioFocusType

content/browser/media/media_web_contents_observer.cc

 // Copyright 2014 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 "content/browser/media/media_web_contents_observer.h"
 
 #include <memory>
 
 #include "base/lazy_instance.h"
 #include "build/build_config.h"
@@ skipping 109 matching lines @@
   else
     session_controllers_manager_.OnPause(player_id);
 }
 
 void MediaWebContentsObserver::OnMediaPlaying(
     RenderFrameHost* render_frame_host,
     int delegate_id,
     bool has_video,
     bool has_audio,
     bool is_remote,
-    base::TimeDelta duration) {
+    media::MediaContentType media_content_type) {
   // Ignore the videos playing remotely and don't hold the wake lock for the
   // screen. TODO(dalecurtis): Is this correct? It means observers will not
   // receive play and pause messages.
   if (is_remote)
     return;
 
   const MediaPlayerId id(render_frame_host, delegate_id);
   if (has_audio) {
     AddMediaPlayerEntry(id, &active_audio_players_);
 
     // If we don't have audio stream monitoring, allocate the audio power save
     // blocker here instead of during NotifyNavigationStateChanged().
     if (!audio_power_save_blocker_ &&
         !AudioStreamMonitor::monitoring_available()) {
       CreateAudioPowerSaveBlocker();
     }
   }
 
   if (has_video) {
     AddMediaPlayerEntry(id, &active_video_players_);
 
     // If we're not hidden and have just created a player, create a blocker.
     if (!video_power_save_blocker_ &&
         !static_cast<WebContentsImpl*>(web_contents())->IsHidden()) {
       CreateVideoPowerSaveBlocker();
     }
   }
 
-  if (!session_controllers_manager_.RequestPlay(
-      id, has_audio, is_remote, duration)) {
+  if (!session_controllers_manager_.RequestPlay(id, has_audio, is_remote,
+                                                media_content_type)) {
     return;
   }
 
   // Notify observers of the new player.
   DCHECK(has_audio || has_video);
   static_cast<WebContentsImpl*>(web_contents())->MediaStartedPlaying(id);
 }
 
 void MediaWebContentsObserver::ClearPowerSaveBlockers(
     RenderFrameHost* render_frame_host) {
@@ skipping 84 matching lines @@
   if (it == player_map->end())
     return;
 
   for (int delegate_id : it->second)
     removed_players->insert(MediaPlayerId(render_frame_host, delegate_id));
 
   player_map->erase(it);
 }
 
 }  // namespace content