Support CAST+WMPI on android

content/renderer/media/android/renderer_media_player_manager.cc

Index: content/renderer/media/android/renderer_media_player_manager.cc
diff --git a/content/renderer/media/android/renderer_media_player_manager.cc b/content/renderer/media/android/renderer_media_player_manager.cc
index 6af19b1bfb9211c2a7fbe023bc54f7e90aaa5da2..23bf9950ee7026a418a22f070b222299ad05da95 100644
--- a/content/renderer/media/android/renderer_media_player_manager.cc
+++ b/content/renderer/media/android/renderer_media_player_manager.cc
@@ -64,7 +64,7 @@ void RendererMediaPlayerManager::WasHidden() {
 }
 
 void RendererMediaPlayerManager::Initialize(
-    MediaPlayerHostMsg_Initialize_Type type,
+    media::MediaPlayerHostMsg_Initialize_Type type,
     int player_id,
     const GURL& url,
     const GURL& first_party_for_cookies,
@@ -72,7 +72,8 @@ void RendererMediaPlayerManager::Initialize(
     const GURL& frame_url,
     bool allow_credentials) {
   MediaPlayerHostMsg_Initialize_Params media_player_params;
-  media_player_params.type = type;
+  media_player_params.type =
+      static_cast<MediaPlayerHostMsg_Initialize_Type>(type);
   media_player_params.player_id = player_id;
   media_player_params.demuxer_client_id = demuxer_client_id;
   media_player_params.url = url;
@@ -131,20 +132,20 @@ void RendererMediaPlayerManager::OnMediaMetadataChanged(
     int width,
     int height,
     bool success) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnMediaMetadataChanged(duration, width, height, success);
 }
 
 void RendererMediaPlayerManager::OnMediaPlaybackCompleted(int player_id) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnPlaybackComplete();
 }
 
 void RendererMediaPlayerManager::OnMediaBufferingUpdate(int player_id,
                                                         int percent) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnBufferingUpdate(percent);
 }
@@ -152,7 +153,7 @@ void RendererMediaPlayerManager::OnMediaBufferingUpdate(int player_id,
 void RendererMediaPlayerManager::OnSeekRequest(
     int player_id,
     const base::TimeDelta& time_to_seek) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnSeekRequest(time_to_seek);
 }
@@ -160,13 +161,13 @@ void RendererMediaPlayerManager::OnSeekRequest(
 void RendererMediaPlayerManager::OnSeekCompleted(
     int player_id,
     const base::TimeDelta& current_time) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnSeekComplete(current_time);
 }
 
 void RendererMediaPlayerManager::OnMediaError(int player_id, int error) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnMediaError(error);
 }
@@ -174,7 +175,7 @@ void RendererMediaPlayerManager::OnMediaError(int player_id, int error) {
 void RendererMediaPlayerManager::OnVideoSizeChanged(int player_id,
                                                     int width,
                                                     int height) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnVideoSizeChanged(width, height);
 }
@@ -183,50 +184,50 @@ void RendererMediaPlayerManager::OnTimeUpdate(
     int player_id,
     base::TimeDelta current_timestamp,
     base::TimeTicks current_time_ticks) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnTimeUpdate(current_timestamp, current_time_ticks);
 }
 
 void RendererMediaPlayerManager::OnWaitingForDecryptionKey(int player_id) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnWaitingForDecryptionKey();
 }
 
 void RendererMediaPlayerManager::OnMediaPlayerReleased(int player_id) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnPlayerReleased();
 }
 
 void RendererMediaPlayerManager::OnConnectedToRemoteDevice(int player_id,
     const std::string& remote_playback_message) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnConnectedToRemoteDevice(remote_playback_message);
 }
 
 void RendererMediaPlayerManager::OnDisconnectedFromRemoteDevice(int player_id) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnDisconnectedFromRemoteDevice();
 }
 
 void RendererMediaPlayerManager::OnDidExitFullscreen(int player_id) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnDidExitFullscreen();
 }
 
 void RendererMediaPlayerManager::OnPlayerPlay(int player_id) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnMediaPlayerPlay();
 }
 
 void RendererMediaPlayerManager::OnPlayerPause(int player_id) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnMediaPlayerPause();
 }
@@ -234,7 +235,7 @@ void RendererMediaPlayerManager::OnPlayerPause(int player_id) {
 void RendererMediaPlayerManager::OnRemoteRouteAvailabilityChanged(
     int player_id,
     bool routes_available) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnRemoteRouteAvailabilityChanged(routes_available);
 }
@@ -252,7 +253,7 @@ void RendererMediaPlayerManager::SetCdm(int player_id, int cdm_id) {
 }
 
 int RendererMediaPlayerManager::RegisterMediaPlayer(
-    WebMediaPlayerAndroid* player) {
+    RendererMediaPlayerInterface* player) {
   media_players_[next_media_player_id_] = player;
   return next_media_player_id_++;
 }
@@ -262,10 +263,10 @@ void RendererMediaPlayerManager::UnregisterMediaPlayer(int player_id) {
 }
 
 void RendererMediaPlayerManager::ReleaseVideoResources() {
-  std::map<int, WebMediaPlayerAndroid*>::iterator player_it;
+  std::map<int, RendererMediaPlayerInterface*>::iterator player_it;
   for (player_it = media_players_.begin(); player_it != media_players_.end();
        ++player_it) {
-    WebMediaPlayerAndroid* player = player_it->second;
+    RendererMediaPlayerInterface* player = player_it->second;
 
     // Do not release if an audio track is still playing
     if (player && (player->paused() || player->hasVideo()))
@@ -273,9 +274,9 @@ void RendererMediaPlayerManager::ReleaseVideoResources() {
   }
 }
 
-WebMediaPlayerAndroid* RendererMediaPlayerManager::GetMediaPlayer(
+RendererMediaPlayerInterface* RendererMediaPlayerManager::GetMediaPlayer(
     int player_id) {
-  std::map<int, WebMediaPlayerAndroid*>::iterator iter =
+  std::map<int, RendererMediaPlayerInterface*>::iterator iter =
       media_players_.find(player_id);
   if (iter != media_players_.end())
     return iter->second;
@@ -304,11 +305,11 @@ void RendererMediaPlayerManager::DidCommitCompositorFrame() {
 void RendererMediaPlayerManager::RetrieveGeometryChanges(
     std::map<int, gfx::RectF>* changes) {
   DCHECK(changes->empty());
-  for (std::map<int, WebMediaPlayerAndroid*>::iterator player_it =
+  for (std::map<int, RendererMediaPlayerInterface*>::iterator player_it =
            media_players_.begin();
        player_it != media_players_.end();
        ++player_it) {
-    WebMediaPlayerAndroid* player = player_it->second;
+    RendererMediaPlayerInterface* player = player_it->second;
 
     if (player && player->hasVideo()) {
       if (player->UpdateBoundaryRectangle())