Separate RendererCdmManager from RendererMediaPlayerManager.

content/renderer/media/crypto/proxy_media_keys.cc

Index: content/renderer/media/crypto/proxy_media_keys.cc
diff --git a/content/renderer/media/android/proxy_media_keys.cc b/content/renderer/media/crypto/proxy_media_keys.cc
similarity index 93%
rename from content/renderer/media/android/proxy_media_keys.cc
rename to content/renderer/media/crypto/proxy_media_keys.cc
index cf2642f5576082807186196aa49fa6c00ff10a6a..21cb5f9576e621c7189cafbb12a25d9a9ad4a036 100644
--- a/content/renderer/media/android/proxy_media_keys.cc
+++ b/content/renderer/media/crypto/proxy_media_keys.cc
@@ -2,24 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/renderer/media/android/proxy_media_keys.h"
+#include "content/renderer/media/crypto/proxy_media_keys.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "content/renderer/media/android/renderer_media_player_manager.h"
 #include "content/renderer/media/crypto/key_systems.h"
+#include "content/renderer/media/crypto/renderer_cdm_manager.h"
 
 namespace content {
 
-int ProxyMediaKeys::next_cdm_id_ =
-    RendererMediaPlayerManager::kInvalidCdmId + 1;
+int ProxyMediaKeys::next_cdm_id_ = RendererCdmManager::kInvalidCdmId + 1;
 
 scoped_ptr<ProxyMediaKeys> 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,
@@ -117,7 +116,7 @@ int ProxyMediaKeys::GetCdmId() const {
 }
 
 ProxyMediaKeys::ProxyMediaKeys(
-    RendererMediaPlayerManager* manager,
+    RendererCdmManager* manager,
     const media::SessionCreatedCB& session_created_cb,
     const media::SessionMessageCB& session_message_cb,
     const media::SessionReadyCB& session_ready_cb,