Rename MediaPlayerBridgeManager to MediaPlayerManager

media/base/android/media_player_manager.h

Index: media/base/android/media_player_manager.h
diff --git a/media/base/android/media_player_bridge_manager.h b/media/base/android/media_player_manager.h
similarity index 65%
rename from media/base/android/media_player_bridge_manager.h
rename to media/base/android/media_player_manager.h
index 93bd99cbd21e7f96f8120b63dafc73660f868b76..c4ae120a8c87e4ec094ab76277deb38b47c1bc98 100644
--- a/media/base/android/media_player_bridge_manager.h
+++ b/media/base/android/media_player_manager.h
@@ -2,21 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_MANAGER_H_
-#define MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_MANAGER_H_
+#ifndef MEDIA_BASE_ANDROID_MEDIA_PLAYER_MANAGER_H_
+#define MEDIA_BASE_ANDROID_MEDIA_PLAYER_MANAGER_H_
 
 #include "media/base/media_export.h"
 
 namespace media {
 
 class MediaPlayerBridge;
+class MediaResourceGetter;
 
 // This class is responsible for managing active MediaPlayerBridge objects.
-// It is implemented by webkit_media::MediaPlayerBridgeManagerImpl and
-// content::MediaPlayerManagerAndroid.
-class MEDIA_EXPORT MediaPlayerBridgeManager {
+// It is implemented by content::MediaPlayerManagerImpl.

[scherkus (not reviewing), 2013/04/30 05:05:49]

update docs? (should it still mention MediaPlayerBridge?)

[qinmin, 2013/04/30 16:38:02]

will update docs after MediaPlayerAndroid is added.

On 2013/04/30 05:05:49, scherkus wrote:

+class MEDIA_EXPORT MediaPlayerManager {
  public:
-  virtual ~MediaPlayerBridgeManager();
+  virtual ~MediaPlayerManager();
 
   // Called by a MediaPlayerBridge object when it is going to decode
   // media streams. This helps the manager object maintain an array
@@ -27,8 +27,11 @@ class MEDIA_EXPORT MediaPlayerBridgeManager {
   // Called when a MediaPlayerBridge object releases all its decoding
   // resources.
   virtual void ReleaseMediaResources(MediaPlayerBridge* player) = 0;
+
+  // Return a pointer to the MediaResourceGetter object.
+  virtual MediaResourceGetter* GetMediaResourceGetter() = 0;
 };
 
 }  // namespace media
 
-#endif  // MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_MANAGER_H_
+#endif  // MEDIA_BASE_ANDROID_MEDIA_PLAYER_MANAGER_H_