Split MediaContentType and AudioFocusType

content/browser/media/android/browser_media_player_manager.cc

 // Copyright 2013 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/android/browser_media_player_manager.h"
 
 #include <utility>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/memory/singleton.h"
@@ skipping 14 matching lines @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "gpu/ipc/common/android/surface_texture_peer.h"
 #include "media/base/android/media_player_bridge.h"
 #include "media/base/android/media_source_player.h"
 #include "media/base/android/media_url_interceptor.h"
+#include "media/base/media_content_type.h"
 
 #if !defined(USE_AURA)
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 #endif
 
 using media::MediaPlayerAndroid;
 using media::MediaPlayerBridge;
 using media::MediaPlayerManager;
 using media::MediaSourcePlayer;
@@ skipping 390 matching lines @@
 }
 
 bool BrowserMediaPlayerManager::RequestPlay(int player_id,
                                             base::TimeDelta duration,
                                             bool has_audio) {
   DCHECK(player_id_to_delegate_id_map_.find(player_id) !=
          player_id_to_delegate_id_map_.end());
   return MediaWebContentsObserverAndroid::FromWebContents(web_contents_)
       ->RequestPlay(render_frame_host_,
                     player_id_to_delegate_id_map_[player_id], has_audio,
-                    IsPlayingRemotely(player_id), duration);
+                    IsPlayingRemotely(player_id),
+                    media::DurationToMediaContentType(duration));
 }
 
 #if defined(VIDEO_HOLE)
 void BrowserMediaPlayerManager::AttachExternalVideoSurface(int player_id,
                                                            jobject surface) {
   MediaPlayerAndroid* player = GetPlayer(player_id);
   if (player) {
     player->SetVideoSurface(
         gl::ScopedJavaSurface::AcquireExternalSurface(surface));
   }
@@ skipping 337 matching lines @@
   if (!player)
     return;
   player->Start();
   if (fullscreen_player_id_ == player_id && fullscreen_player_is_released_) {
     video_view_->OpenVideo();
     fullscreen_player_is_released_ = false;
   }
 }
 
 }  // namespace content