Support CAST+WMPI on android

content/renderer/media/android/renderer_media_player_manager.h

Index: content/renderer/media/android/renderer_media_player_manager.h
diff --git a/content/renderer/media/android/renderer_media_player_manager.h b/content/renderer/media/android/renderer_media_player_manager.h
index 94cb9fd8e71503dd2e764e79af8e6a55551bef27..1b68ac31b879afe9f6ad179e8873bff9386dfc2c 100644
--- a/content/renderer/media/android/renderer_media_player_manager.h
+++ b/content/renderer/media/android/renderer_media_player_manager.h
@@ -13,6 +13,7 @@
 #include "content/common/media/media_player_messages_enums_android.h"
 #include "content/public/renderer/render_frame_observer.h"
 #include "media/base/android/media_player_android.h"
+#include "media/blink/renderer_media_player_interface.h"
 #include "url/gurl.h"
 
 namespace blink {
@@ -27,10 +28,13 @@ struct MediaPlayerHostMsg_Initialize_Params;
 
 namespace content {
 class WebMediaPlayerAndroid;
+using media::RendererMediaPlayerInterface;
 
 // Class for managing all the WebMediaPlayerAndroid objects in the same
 // RenderFrame.
-class RendererMediaPlayerManager : public RenderFrameObserver {
+class RendererMediaPlayerManager :
+      public RenderFrameObserver,
+      public media::RendererMediaPlayerManagerInterface {
  public:
   // Constructs a RendererMediaPlayerManager object for the |render_frame|.
   explicit RendererMediaPlayerManager(RenderFrame* render_frame);
@@ -41,44 +45,44 @@ class RendererMediaPlayerManager : public RenderFrameObserver {
   void WasHidden() override;
 
   // Initializes a MediaPlayerAndroid object in browser process.
-  void Initialize(MediaPlayerHostMsg_Initialize_Type type,
+  void Initialize(media::MediaPlayerHostMsg_Initialize_Type type,
                   int player_id,
                   const GURL& url,
                   const GURL& first_party_for_cookies,
                   int demuxer_client_id,
                   const GURL& frame_url,
-                  bool allow_credentials);
+                  bool allow_credentials) override;
 
   // Starts the player.
-  void Start(int player_id);
+  void Start(int player_id) override;
 
   // Pauses the player.
   // is_media_related_action should be true if this pause is coming from an
   // an action that explicitly pauses the video (user pressing pause, JS, etc.)
   // Otherwise it should be false if Pause is being called due to other reasons
   // (cleanup, freeing resources, etc.)
-  void Pause(int player_id, bool is_media_related_action);
+  void Pause(int player_id, bool is_media_related_action) override;
 
   // Performs seek on the player.
-  void Seek(int player_id, const base::TimeDelta& time);
+  void Seek(int player_id, const base::TimeDelta& time) override;
 
   // Sets the player volume.
-  void SetVolume(int player_id, double volume);
+  void SetVolume(int player_id, double volume) override;
 
   // Sets the poster image.
-  void SetPoster(int player_id, const GURL& poster);
+  void SetPoster(int player_id, const GURL& poster) override;
 
   // Releases resources for the player.
-  void ReleaseResources(int player_id);
+  void ReleaseResources(int player_id) override;
 
   // Destroys the player in the browser process
-  void DestroyPlayer(int player_id);
+  void DestroyPlayer(int player_id) override;
 
   // Requests remote playback if possible
-  void RequestRemotePlayback(int player_id);
+  void RequestRemotePlayback(int player_id) override;
 
   // Requests control of remote playback
-  void RequestRemotePlaybackControl(int player_id);
+  void RequestRemotePlaybackControl(int player_id) override;
 
   // Requests the player to enter fullscreen.
   void EnterFullscreen(int player_id);
@@ -101,11 +105,11 @@ class RendererMediaPlayerManager : public RenderFrameObserver {
 #endif  // defined(VIDEO_HOLE)
 
   // Registers and unregisters a WebMediaPlayerAndroid object.
-  int RegisterMediaPlayer(WebMediaPlayerAndroid* player);
-  void UnregisterMediaPlayer(int player_id);
+  int RegisterMediaPlayer(RendererMediaPlayerInterface* player) override;
+  void UnregisterMediaPlayer(int player_id) override;
 
   // Gets the pointer to WebMediaPlayerAndroid given the |player_id|.
-  WebMediaPlayerAndroid* GetMediaPlayer(int player_id);
+  RendererMediaPlayerInterface* GetMediaPlayer(int player_id);
 
 #if defined(VIDEO_HOLE)
   // Gets the list of media players with video geometry changes.
@@ -148,7 +152,7 @@ class RendererMediaPlayerManager : public RenderFrameObserver {
 
   // Info for all available WebMediaPlayerAndroid on a page; kept so that
   // we can enumerate them to send updates about tab focus and visibility.
-  std::map<int, WebMediaPlayerAndroid*> media_players_;
+  std::map<int, RendererMediaPlayerInterface*> media_players_;
 
   int next_media_player_id_;