Make RendererMediaPlayerManager a RenderFrameObserver.

content/browser/media/android/browser_media_player_manager.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/time/time.h"
 #include "content/browser/android/content_video_view.h"
+#include "content/common/content_export.h"
 #include "content/common/media/cdm_messages_enums.h"
 #include "content/common/media/media_player_messages_enums_android.h"
-#include "content/public/browser/web_contents_observer.h"
+#include "ipc/ipc_message.h"
 #include "media/base/android/media_player_android.h"
 #include "media/base/android/media_player_manager.h"
 #include "ui/gfx/rect_f.h"
 #include "url/gurl.h"
 
 namespace media {
 class DemuxerAndroid;
 class MediaKeys;
 }
 
 namespace content {
 class BrowserDemuxerAndroid;
 class ContentViewCoreImpl;
 class ExternalVideoSurfaceContainer;
+class RenderFrameHost;
 class WebContents;
 
 // This class manages all the MediaPlayerAndroid and CDM objects.
 // It receives control operations from the the render process, and forwards
 // them to corresponding MediaPlayerAndroid or CDM object. Callbacks from
 // MediaPlayerAndroid and CDM objects are converted to IPCs and then sent to
 // the render process.
 class CONTENT_EXPORT BrowserMediaPlayerManager
-    : public WebContentsObserver,
-      public media::MediaPlayerManager {
+    : public media::MediaPlayerManager {
  public:
   // Permits embedders to provide an extended version of the class.
-  typedef BrowserMediaPlayerManager* (*Factory)(RenderViewHost*);
+  typedef BrowserMediaPlayerManager* (*Factory)(RenderFrameHost*);
   static void RegisterFactory(Factory factory);
 
   // Returns a new instance using the registered factory if available.
-  static BrowserMediaPlayerManager* Create(RenderViewHost* rvh);
+  static BrowserMediaPlayerManager* Create(RenderFrameHost* rfh);
 
   ContentViewCoreImpl* GetContentViewCore() const;
 
   virtual ~BrowserMediaPlayerManager();
 
-  // WebContentsObserver overrides.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-
   // Fullscreen video playback controls.
   virtual void FullscreenPlayerPlay();
   virtual void FullscreenPlayerPause();
   virtual void FullscreenPlayerSeek(int msec);
   virtual void ExitFullscreen(bool release_media_player);
   virtual void SetVideoSurface(gfx::ScopedJavaSurface surface);
 
   // Called when browser player wants the renderer media element to seek.
   // Any actual seek started by renderer will be handled by browser in OnSeek().
   void OnSeekRequest(int player_id, const base::TimeDelta& time_to_seek);
@@ skipping 35 matching lines @@
                               uint32 session_id,
                               media::MediaKeys::KeyError error_code,
                               uint32 system_code) OVERRIDE;
 
 #if defined(VIDEO_HOLE)
   void AttachExternalVideoSurface(int player_id, jobject surface);
   void DetachExternalVideoSurface(int player_id);
   void OnFrameInfoUpdated();
 #endif  // defined(VIDEO_HOLE)
 
- protected:
-  // Clients must use Create() or subclass constructor.
-  explicit BrowserMediaPlayerManager(RenderViewHost* render_view_host);
-
   // Message handlers.
   virtual void OnEnterFullscreen(int player_id);
   virtual void OnExitFullscreen(int player_id);
   virtual void OnInitialize(
       MediaPlayerHostMsg_Initialize_Type type,
       int player_id,
       const GURL& url,
       const GURL& first_party_for_cookies,
       int demuxer_client_id);
   virtual void OnStart(int player_id);
@@ skipping 11 matching lines @@
                        uint32 session_id,
                        CdmHostMsg_CreateSession_ContentType content_type,
                        const std::vector<uint8>& init_data);
   void OnUpdateSession(int cdm_id,
                        uint32 session_id,
                        const std::vector<uint8>& response);
   void OnReleaseSession(int cdm_id, uint32 session_id);
   void OnSetCdm(int player_id, int cdm_id);
   void OnDestroyCdm(int cdm_id);
 
+ protected:
+  // Clients must use Create() or subclass constructor.
+  explicit BrowserMediaPlayerManager(RenderFrameHost* render_frame_host);
+
+  WebContents* web_contents() const { return web_contents_; }
+
+  int routing_id() const { return routing_id_; }
+
   // Cancels all pending session creations associated with |cdm_id|.
   void CancelAllPendingSessionCreations(int cdm_id);
 
   // Adds a given player to the list.
   void AddPlayer(media::MediaPlayerAndroid* player);
 
   // Removes the player with the specified id.
   void RemovePlayer(int player_id);
 
   // Replaces a player with the specified id with a given MediaPlayerAndroid
   // object. This will also return the original MediaPlayerAndroid object that
   // was replaced.
   scoped_ptr<media::MediaPlayerAndroid> SwapPlayer(
       int player_id,
       media::MediaPlayerAndroid* player);
 
   // Adds a new CDM for the given |key_system|, |cdm_id|, and |security_origin|.
   void AddCdm(int cdm_id,
               const std::string& key_system,
               const GURL& security_origin);
 
   // Removes the CDM with the specified id.
   void RemoveCdm(int cdm_id);
 
+  // Helper function to send messages to RenderFrameObserver.
+  bool Send(IPC::Message* msg);
+
  private:
   // If |permitted| is false, it does nothing but send
   // |CdmMsg_SessionError| IPC message.
   // The primary use case is infobar permission callback, i.e., when infobar
   // can decide user's intention either from interacting with the actual info
   // bar or from the saved preference.
   void CreateSessionIfPermitted(int cdm_id,
                                 uint32 session_id,
                                 const std::string& content_type,
                                 const std::vector<uint8>& init_data,
@@ skipping 20 matching lines @@
   // Similar to the above call, MediaPlayerAndroid must call this method when
   // releasing all the decoding resources.
   virtual void OnMediaResourcesReleased(int player_id);
 
 #if defined(VIDEO_HOLE)
   void OnNotifyExternalSurface(
       int player_id, bool is_request, const gfx::RectF& rect);
   void OnRequestExternalSurface(int player_id, const gfx::RectF& rect);
 #endif  // defined(VIDEO_HOLE)
 
+  RenderFrameHost* const render_frame_host_;
+  const int routing_id_;

[jam, 2014/05/20 00:34:49]

nit: this is redundant since you can always get it from render_frame_host_

[xhwang, 2014/05/22 19:06:00]

Done.

+
   // An array of managed players.
   ScopedVector<media::MediaPlayerAndroid> players_;
 
   // A map from CDM IDs to managed CDMs.
   typedef std::map<int, media::MediaKeys*> CdmMap;
   CdmMap cdm_map_;
 
   // Map from CDM ID to MediaPlayerAndroid player ID to indicate that
   // the CDM is set on the MediaPlayerAndroid object.
   typedef std::map<int, int> CdmToPlayerMap;
   CdmToPlayerMap cdm_to_player_map_;
 
   // Map from CDM ID to CDM's security origin.
   std::map<int, GURL> security_origin_map_;
 
   // The fullscreen video view object or NULL if video is not played in
   // fullscreen.
   scoped_ptr<ContentVideoView> video_view_;
 
 #if defined(VIDEO_HOLE)
   scoped_ptr<ExternalVideoSurfaceContainer> external_video_surface_container_;
 #endif
 
   // Player ID of the fullscreen media player.
   int fullscreen_player_id_;
 
   // Whether the fullscreen player has been Release()-d.
   bool fullscreen_player_is_released_;
 
-  WebContents* web_contents_;
+  WebContents* const web_contents_;
 
   // Object for retrieving resources media players.
   scoped_ptr<media::MediaResourceGetter> media_resource_getter_;
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_