Split MediaContentType and AudioFocusType

content/renderer/media/renderer_webmediaplayer_delegate.cc

 // Copyright 2015 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/renderer/media/renderer_webmediaplayer_delegate.h"
 
 #include <stdint.h>
 
 #include "base/auto_reset.h"
 #include "content/common/media/media_player_delegate_messages.h"
@@ skipping 16 matching lines @@
 int RendererWebMediaPlayerDelegate::AddObserver(Observer* observer) {
   return id_map_.Add(observer);
 }
 
 void RendererWebMediaPlayerDelegate::RemoveObserver(int delegate_id) {
   DCHECK(id_map_.Lookup(delegate_id));
   id_map_.Remove(delegate_id);
   RemoveIdleDelegate(delegate_id);
 }
 
-void RendererWebMediaPlayerDelegate::DidPlay(int delegate_id,
-                                             bool has_video,
-                                             bool has_audio,
-                                             bool is_remote,
-                                             base::TimeDelta duration) {
+void RendererWebMediaPlayerDelegate::DidPlay(
+    int delegate_id,
+    bool has_video,
+    bool has_audio,
+    bool is_remote,
+    MediaContentType media_content_type) {
   DCHECK(id_map_.Lookup(delegate_id));
   has_played_media_ = true;
   RemoveIdleDelegate(delegate_id);
   Send(new MediaPlayerDelegateHostMsg_OnMediaPlaying(
-      routing_id(), delegate_id, has_video, has_audio, is_remote, duration));
+      routing_id(),
+      delegate_id, has_video, has_audio, is_remote, media_content_type));
 }
 
 void RendererWebMediaPlayerDelegate::DidPause(int delegate_id,
                                               bool reached_end_of_stream) {
   DCHECK(id_map_.Lookup(delegate_id));
   AddIdleDelegate(delegate_id);
   Send(new MediaPlayerDelegateHostMsg_OnMediaPaused(routing_id(), delegate_id,
                                                     reached_end_of_stream));
 }
 
@@ skipping 115 matching lines @@
   // Shutdown the timer if no delegates are left.
   if (idle_delegate_map_.empty())
     idle_cleanup_timer_.Stop();
 }
 
 void RendererWebMediaPlayerDelegate::OnDestruct() {
   delete this;
 }
 
 }  // namespace media