Encrypted Media: Drop wrong DCHECK in RendererMediaPlayerManager.

Now the |player_id| is generated in
RendererMediaPlayerManager::RegisterMediaPlayer() and the |cdm_id| is generated
in ProxyMediaKeys::ProxyMediaKeys(). They are different in general and can be
the same only be accident. This DCHECK is wrong which assumes the |cdm_id| is
always the same as the |player_id|.

BUG=338910

Review URL: https://codereview.chromium.org/226043006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262033 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 6 deletions

diff --git a/content/renderer/media/android/renderer_media_player_manager.cc b/content/renderer/media/android/renderer_media_player_manager.cc
index 44f270a..f99cb2b 100644
--- a/content/renderer/media/android/renderer_media_player_manager.cc
+++ b/content/renderer/media/android/renderer_media_player_manager.cc
@@ -283,6 +283,7 @@ void RendererMediaPlayerManager::ReleaseSession(int cdm_id, uint32 session_id) {
 void RendererMediaPlayerManager::DestroyCdm(int cdm_id) {
   DCHECK(GetMediaKeys(cdm_id)) << "|cdm_id| not registered.";
   Send(new CdmHostMsg_DestroyCdm(routing_id(), cdm_id));
+  media_keys_.erase(cdm_id);
 }
 
 void RendererMediaPlayerManager::OnSessionCreated(
@@ -345,16 +346,10 @@ int RendererMediaPlayerManager::RegisterMediaPlayer(
 
 void RendererMediaPlayerManager::UnregisterMediaPlayer(int player_id) {
   media_players_.erase(player_id);
-  media_keys_.erase(player_id);
 }
 
 void RendererMediaPlayerManager::RegisterMediaKeys(int cdm_id,
                                                    ProxyMediaKeys* media_keys) {
-  // WebMediaPlayerAndroid must have already been registered for
-  // |cdm_id|. For now |cdm_id| is the same as player_id
-  // used in other methods.
-  DCHECK(media_players_.find(cdm_id) != media_players_.end());
-
   // Only allowed to register once.
   DCHECK(media_keys_.find(cdm_id) == media_keys_.end());