Separate RendererCdmManager from RendererMediaPlayerManager.

content/renderer/media/android/proxy_media_keys.h

Index: content/renderer/media/android/proxy_media_keys.h
diff --git a/content/renderer/media/android/proxy_media_keys.h b/content/renderer/media/android/proxy_media_keys.h
index afe1719b5739f99c7f3db2fb4bc2154f95893ad5..25973650d5238fd1e3d177b206f94104928b535f 100644
--- a/content/renderer/media/android/proxy_media_keys.h
+++ b/content/renderer/media/android/proxy_media_keys.h
@@ -12,18 +12,18 @@ class GURL;
 
 namespace content {
 
-class RendererMediaPlayerManager;
+class RendererCdmManager;
 
-// A MediaKeys proxy that wraps the EME part of RendererMediaPlayerManager.
-// TODO(xhwang): Instead of accessing RendererMediaPlayerManager directly, let
-// RendererMediaPlayerManager return a MediaKeys object that can be used by
+// A MediaKeys proxy that wraps the EME part of RendererCdmManager.
+// TODO(xhwang): Instead of accessing RendererCdmManager directly, let
+// RendererCdmManager return a MediaKeys object that can be used by
 // ProxyDecryptor directly. Then we can remove this class!
 class ProxyMediaKeys : public media::MediaKeys {
  public:
   static scoped_ptr<ProxyMediaKeys> Create(
       const std::string& key_system,
       const GURL& security_origin,
-      RendererMediaPlayerManager* manager,
+      RendererCdmManager* manager,
       const media::SessionCreatedCB& session_created_cb,
       const media::SessionMessageCB& session_message_cb,
       const media::SessionReadyCB& session_ready_cb,
@@ -58,7 +58,7 @@ class ProxyMediaKeys : public media::MediaKeys {
   int GetCdmId() const;
 
  private:
-  ProxyMediaKeys(RendererMediaPlayerManager* manager,
+  ProxyMediaKeys(RendererCdmManager* manager,
                  const media::SessionCreatedCB& session_created_cb,
                  const media::SessionMessageCB& session_message_cb,
                  const media::SessionReadyCB& session_ready_cb,
@@ -72,7 +72,7 @@ class ProxyMediaKeys : public media::MediaKeys {
   // TODO(xhwang): Use uint32 to prevent undefined overflow behavior.
   static int next_cdm_id_;
 
-  RendererMediaPlayerManager* manager_;
+  RendererCdmManager* manager_;
   int cdm_id_;
   media::SessionCreatedCB session_created_cb_;
   media::SessionMessageCB session_message_cb_;