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 "base/metrics/histogram_macros.h"
@@ skipping 28 matching lines @@
   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);
   playing_videos_.erase(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;
   if (has_video && !is_remote)
     playing_videos_.insert(delegate_id);
   else
     playing_videos_.erase(delegate_id);
   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);
   if (reached_end_of_stream)
     playing_videos_.erase(delegate_id);
   Send(new MediaPlayerDelegateHostMsg_OnMediaPaused(routing_id(), delegate_id,
                                                     reached_end_of_stream));
@@ skipping 159 matching lines @@
 #endif  // OS_ANDROID
 
   is_playing_background_video_ = is_playing;
 }
 
 void RendererWebMediaPlayerDelegate::OnDestruct() {
   delete this;
 }
 
 }  // namespace media