Separate RendererCdmManager from RendererMediaPlayerManager.

content/renderer/media/crypto/content_decryption_module_factory.cc

Index: content/renderer/media/crypto/content_decryption_module_factory.cc
diff --git a/content/renderer/media/crypto/content_decryption_module_factory.cc b/content/renderer/media/crypto/content_decryption_module_factory.cc
index 82d6b0f6d85540a816a4186d3c041c07e0f3fb36..159e7f181bf137f84d3ac6081f1fe379994a7847 100644
--- a/content/renderer/media/crypto/content_decryption_module_factory.cc
+++ b/content/renderer/media/crypto/content_decryption_module_factory.cc
@@ -12,8 +12,8 @@
 #if defined(ENABLE_PEPPER_CDMS)
 #include "content/renderer/media/crypto/ppapi_decryptor.h"
 #elif defined(OS_ANDROID)
-#include "content/renderer/media/android/proxy_media_keys.h"
-#include "content/renderer/media/android/renderer_media_player_manager.h"
+#include "content/renderer/media/crypto/proxy_media_keys.h"
+#include "content/renderer/media/crypto/renderer_cdm_manager.h"
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
 namespace content {
@@ -24,7 +24,7 @@ scoped_ptr<media::MediaKeys> ContentDecryptionModuleFactory::Create(
 #if defined(ENABLE_PEPPER_CDMS)
     const CreatePepperCdmCB& create_pepper_cdm_cb,
 #elif defined(OS_ANDROID)
-    RendererMediaPlayerManager* manager,
+    RendererCdmManager* manager,
     int* cdm_id,
 #endif  // defined(ENABLE_PEPPER_CDMS)
     const media::SessionCreatedCB& session_created_cb,
@@ -38,7 +38,7 @@ scoped_ptr<media::MediaKeys> ContentDecryptionModuleFactory::Create(
   // DCHECK(security_origin.is_valid());
 
 #if defined(OS_ANDROID)
-  *cdm_id = RendererMediaPlayerManager::kInvalidCdmId;
+  *cdm_id = RendererCdmManager::kInvalidCdmId;
 #endif
 
   if (CanUseAesDecryptor(key_system)) {