Move android mediaplayer from render process to browser process.

webkit/media/android/webmediaplayer_manager_android.cc

Index: webkit/media/android/webmediaplayer_manager_android.cc
diff --git a/webkit/media/android/webmediaplayer_manager_android.cc b/webkit/media/android/webmediaplayer_manager_android.cc
index 4d2ae88ef6f3b07ebe9aefd7f26fd4d8ea24638b..f93854d51e37551dbfbf5e5a4c01adce6b7f41db 100644
--- a/webkit/media/android/webmediaplayer_manager_android.cc
+++ b/webkit/media/android/webmediaplayer_manager_android.cc
@@ -6,10 +6,6 @@
 
 #include "webkit/media/android/webmediaplayer_android.h"
 
-// Threshold on the number of media players per renderer before we start
-// attempting to release inactive media players.
-static const int kMediaPlayerThreshold = 2;
-
 namespace webkit_media {
 
 WebMediaPlayerManagerAndroid::WebMediaPlayerManagerAndroid()
@@ -27,37 +23,9 @@ int WebMediaPlayerManagerAndroid::RegisterMediaPlayer(
 }
 
 void WebMediaPlayerManagerAndroid::UnregisterMediaPlayer(int player_id) {
-  std::map<int32, WebMediaPlayerAndroid*>::iterator iter =
-      media_players_.find(player_id);
-  DCHECK(iter != media_players_.end());
-
   media_players_.erase(player_id);
 }
 
-void WebMediaPlayerManagerAndroid::RequestMediaResources(int player_id) {
-  std::map<int32, WebMediaPlayerAndroid*>::iterator iter =
-      media_players_.find(player_id);
-  DCHECK(iter != media_players_.end());
-
-  if ((iter->second)->IsInitialized())
-    return;
-
-  // Release active players that are paused. Because we only release paused
-  // players, the number of running players could go beyond the limit.
-  // TODO(qinmin): we should use LRU to release the oldest player if we are
-  // reaching hardware limit.
-  if (GetActivePlayerCount() < kMediaPlayerThreshold)
-    return;
-
-  std::map<int32, WebMediaPlayerAndroid*>::iterator player_it;
-  for (player_it = media_players_.begin();
-       player_it != media_players_.end(); ++player_it) {
-    WebMediaPlayerAndroid* player = player_it->second;
-    if (player->IsInitialized() && player->paused())
-      player->ReleaseMediaResources();
-  }
-}
-
 void WebMediaPlayerManagerAndroid::ReleaseMediaResources() {
   std::map<int32, WebMediaPlayerAndroid*>::iterator player_it;
   for (player_it = media_players_.begin();
@@ -66,16 +34,6 @@ void WebMediaPlayerManagerAndroid::ReleaseMediaResources() {
   }
 }
 
-int32 WebMediaPlayerManagerAndroid::GetActivePlayerCount() {
-  int32 count = 0;
-  std::map<int32, WebMediaPlayerAndroid*>::iterator iter;
-  for (iter = media_players_.begin(); iter != media_players_.end(); ++iter) {
-    if ((iter->second)->IsInitialized())
-      count++;
-  }
-  return count;
-}
-
 WebMediaPlayerAndroid* WebMediaPlayerManagerAndroid::GetMediaPlayer(
     int player_id) {
   std::map<int32, WebMediaPlayerAndroid*>::iterator iter =