Separate RendererCdmManager from RendererMediaPlayerManager.

content/renderer/media/crypto/proxy_decryptor.cc

Index: content/renderer/media/crypto/proxy_decryptor.cc
diff --git a/content/renderer/media/crypto/proxy_decryptor.cc b/content/renderer/media/crypto/proxy_decryptor.cc
index 079304eb4779320acb8799b8e643ce4920e9b0b4..6c1639e9bebf4181a82205bbcd6c6fbb1fdad360 100644
--- a/content/renderer/media/crypto/proxy_decryptor.cc
+++ b/content/renderer/media/crypto/proxy_decryptor.cc
@@ -19,7 +19,7 @@
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
 #if defined(OS_ANDROID)
-#include "content/renderer/media/android/renderer_media_player_manager.h"
+#include "content/renderer/media/crypto/renderer_cdm_manager.h"
 #endif  // defined(OS_ANDROID)
 
 namespace content {
@@ -41,7 +41,7 @@ ProxyDecryptor::ProxyDecryptor(
 #if defined(ENABLE_PEPPER_CDMS)
     const CreatePepperCdmCB& create_pepper_cdm_cb,
 #elif defined(OS_ANDROID)
-    RendererMediaPlayerManager* manager,
+    RendererCdmManager* manager,
 #endif  // defined(ENABLE_PEPPER_CDMS)
     const KeyAddedCB& key_added_cb,
     const KeyErrorCB& key_error_cb,
@@ -51,7 +51,7 @@ ProxyDecryptor::ProxyDecryptor(
       create_pepper_cdm_cb_(create_pepper_cdm_cb),
 #elif defined(OS_ANDROID)
       manager_(manager),
-      cdm_id_(RendererMediaPlayerManager::kInvalidCdmId),
+      cdm_id_(RendererCdmManager::kInvalidCdmId),
 #endif  // defined(ENABLE_PEPPER_CDMS)
       key_added_cb_(key_added_cb),
       key_error_cb_(key_error_cb),