Separate RendererCdmManager from RendererMediaPlayerManager.

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 73044c45b9da420c2f11e6971c17b58e8cc5bda1..3ce079fd5dd7c309d1dc7c4afc8dfc510173d2a1 100644
--- a/content/renderer/media/android/renderer_media_player_manager.h
+++ b/content/renderer/media/android/renderer_media_player_manager.h
@@ -7,15 +7,12 @@
 
 #include <map>
 #include <string>
-#include <vector>
 
 #include "base/basictypes.h"
 #include "base/time/time.h"
-#include "content/common/media/cdm_messages_enums.h"
 #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/base/media_keys.h"
 #include "url/gurl.h"
 
 namespace blink {
@@ -28,17 +25,14 @@ class RectF;
 
 namespace content {
 
-class ProxyMediaKeys;
 class WebMediaPlayerAndroid;
 
 // Class for managing all the WebMediaPlayerAndroid objects in the same
 // RenderFrame.
 class RendererMediaPlayerManager : public RenderFrameObserver {
  public:
-  static const int kInvalidCdmId = 0;
-
   // Constructs a RendererMediaPlayerManager object for the |render_frame|.
-  RendererMediaPlayerManager(RenderFrame* render_frame);
+  explicit RendererMediaPlayerManager(RenderFrame* render_frame);
   virtual ~RendererMediaPlayerManager();
 
   // RenderFrameObserver overrides.
@@ -99,31 +93,10 @@ class RendererMediaPlayerManager : public RenderFrameObserver {
   bool ShouldUseVideoOverlayForEmbeddedEncryptedVideo();
 #endif  // defined(VIDEO_HOLE)
 
-  // Encrypted media related methods.
-  void InitializeCdm(int cdm_id,
-                     ProxyMediaKeys* media_keys,
-                     const std::string& key_system,
-                     const GURL& security_origin);
-  void CreateSession(int cdm_id,
-                     uint32 session_id,
-                     CdmHostMsg_CreateSession_ContentType conent_type,
-                     const std::vector<uint8>& init_data);
-  void UpdateSession(int cdm_id,
-                     uint32 session_id,
-                     const std::vector<uint8>& response);
-  void ReleaseSession(int cdm_id, uint32 session_id);
-  void DestroyCdm(int cdm_id);
-
   // Registers and unregisters a WebMediaPlayerAndroid object.
   int RegisterMediaPlayer(WebMediaPlayerAndroid* player);
   void UnregisterMediaPlayer(int player_id);
 
-  // Registers a ProxyMediaKeys object. There must be a WebMediaPlayerAndroid
-  // object already registered for this id, and it is unregistered when the
-  // player is unregistered. For now |cdm_id| is the same as player_id
-  // used in other methods.
-  void RegisterMediaKeys(int cdm_id, ProxyMediaKeys* media_keys);
-
   // Checks whether a player can enter fullscreen.
   bool CanEnterFullscreen(blink::WebFrame* frame);
 
@@ -140,9 +113,6 @@ class RendererMediaPlayerManager : public RenderFrameObserver {
   // Gets the pointer to WebMediaPlayerAndroid given the |player_id|.
   WebMediaPlayerAndroid* GetMediaPlayer(int player_id);
 
-  // Gets the pointer to ProxyMediaKeys given the |cdm_id|.
-  ProxyMediaKeys* GetMediaKeys(int cdm_id);
-
 #if defined(VIDEO_HOLE)
   // Gets the list of media players with video geometry changes.
   void RetrieveGeometryChanges(std::map<int, gfx::RectF>* changes);
@@ -172,19 +142,6 @@ class RendererMediaPlayerManager : public RenderFrameObserver {
   void OnPlayerPause(int player_id);
   void OnRequestFullscreen(int player_id);
   void OnPauseVideo();
-  void OnSessionCreated(int cdm_id,
-                        uint32 session_id,
-                        const std::string& web_session_id);
-  void OnSessionMessage(int cdm_id,
-                        uint32 session_id,
-                        const std::vector<uint8>& message,
-                        const GURL& destination_url);
-  void OnSessionReady(int cdm_id, uint32 session_id);
-  void OnSessionClosed(int cdm_id, uint32 session_id);
-  void OnSessionError(int cdm_id,
-                      uint32 session_id,
-                      media::MediaKeys::KeyError error_code,
-                      uint32 system_code);
 
   // Release all video player resources.
   // If something is in progress the resource will not be freed. It will
@@ -196,10 +153,6 @@ class RendererMediaPlayerManager : public RenderFrameObserver {
   // we can enumerate them to send updates about tab focus and visibility.
   std::map<int, WebMediaPlayerAndroid*> media_players_;
 
-  // Info for all available ProxyMediaKeys. There must be at most one
-  // ProxyMediaKeys for each available WebMediaPlayerAndroid.
-  std::map<int, ProxyMediaKeys*> media_keys_;
-
   int next_media_player_id_;
 
   // WebFrame of the fullscreen video.