Move android mediaplayer from render process to browser process.

webkit/media/android/webmediaplayer_manager_android.h

Index: webkit/media/android/webmediaplayer_manager_android.h
diff --git a/webkit/media/android/webmediaplayer_manager_android.h b/webkit/media/android/webmediaplayer_manager_android.h
index ab29303626c16481d6f88be75fefd65385c7cebd..29482b705d7cdea77bad3b744733f7c295517385 100644
--- a/webkit/media/android/webmediaplayer_manager_android.h
+++ b/webkit/media/android/webmediaplayer_manager_android.h
@@ -5,7 +5,6 @@
 #ifndef WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_MANAGER_ANDROID_H_
 #define WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_MANAGER_ANDROID_H_
 
-#include <jni.h>
 #include <map>
 
 #include "base/basictypes.h"
@@ -14,34 +13,24 @@ namespace webkit_media {
 
 class WebMediaPlayerAndroid;
 
-// Class for managing all the WebMediaPlayerAndroid objects in a renderer
-// process.
+// Class for managing all the WebMediaPlayerAndroid objects in the same
+// RenderView.
 class WebMediaPlayerManagerAndroid {
  public:
   WebMediaPlayerManagerAndroid();
-  ~WebMediaPlayerManagerAndroid();
+  virtual ~WebMediaPlayerManagerAndroid();
 
   // Register and unregister a WebMediaPlayerAndroid object.
   int RegisterMediaPlayer(WebMediaPlayerAndroid* player);
   void UnregisterMediaPlayer(int player_id);
 
-  // Called when a mediaplayer starts to decode media. If the number
-  // of active decoders hits the limit, release some resources.
-  // TODO(qinmin): we need to classify between video and audio decoders.
-  // Audio decoders are inexpensive. And css animations often come with
-  // lots of small audio files.
-  void RequestMediaResources(int player_id);
-
-  // Release all the media resources on the renderer process.
+  // Release all the media resources managed by this object.
   void ReleaseMediaResources();
 
   // Get the pointer to WebMediaPlayerAndroid given the |player_id|.
   WebMediaPlayerAndroid* GetMediaPlayer(int player_id);
 
  private:
-  // Get the number of active players.
-  int32 GetActivePlayerCount();
-
   // Info for all available WebMediaPlayerAndroid on a page; kept so that
   // we can enumerate them to send updates about tab focus and visibily.
   std::map<int32, WebMediaPlayerAndroid*> media_players_;