Encrypted Media: Destroy CDM in ProxyMediaKeys' dtor.

content/browser/media/android/browser_media_player_manager.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/media/android/browser_media_player_manager.h"
 
 #include "base/command_line.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/media/android/browser_demuxer_android.h"
 #include "content/browser/media/android/media_resource_getter_impl.h"
@@ skipping 126 matching lines @@
     IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_SetPoster, OnSetPoster)
     IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_Release, OnReleaseResources)
     IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyMediaPlayer, OnDestroyPlayer)
     IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyAllMediaPlayers,
                         DestroyAllMediaPlayers)
     IPC_MESSAGE_HANDLER(MediaKeysHostMsg_InitializeCDM,
                         OnInitializeCDM)
     IPC_MESSAGE_HANDLER(MediaKeysHostMsg_CreateSession, OnCreateSession)
     IPC_MESSAGE_HANDLER(MediaKeysHostMsg_UpdateSession, OnUpdateSession)
     IPC_MESSAGE_HANDLER(MediaKeysHostMsg_ReleaseSession, OnReleaseSession)
-    IPC_MESSAGE_HANDLER(MediaKeysHostMsg_CancelAllPendingSessionCreations,
-                        OnCancelAllPendingSessionCreations)
+    IPC_MESSAGE_HANDLER(MediaKeysHostMsg_DestroyCdm, OnDestroyCdm)
 #if defined(VIDEO_HOLE)
     IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_NotifyExternalSurface,
                         OnNotifyExternalSurface)
 #endif  // defined(VIDEO_HOLE)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void BrowserMediaPlayerManager::FullscreenPlayerPlay() {
@@ skipping 563 matching lines @@
   if (!drm_bridge) {
     DLOG(WARNING) << "No MediaDrmBridge for ID: " << media_keys_id << " found";
     OnSessionError(
         media_keys_id, session_id, media::MediaKeys::kUnknownError, 0);
     return;
   }
 
   drm_bridge->ReleaseSession(session_id);
 }
 
-void BrowserMediaPlayerManager::OnCancelAllPendingSessionCreations(
-    int media_keys_id) {
+void BrowserMediaPlayerManager::OnDestroyCdm(int media_keys_id) {
   MediaDrmBridge* drm_bridge = GetDrmBridge(media_keys_id);
   if (!drm_bridge) return;
 
   BrowserContext* context =

[ddorwin, 2014/02/26 19:10:00]

We should either comment what's going on here (roughly
OnCancelAllPendingSessionCreations)or break it out into a separate function.

[xhwang, 2014/02/26 19:18:58]

Added CancelAllPendingSessionCreations() function with comments.

       web_contents()->GetRenderProcessHost()->GetBrowserContext();
   context->CancelProtectedMediaIdentifierPermissionRequests(media_keys_id);
+
+  RemoveDrmBridge(media_keys_id);
 }
 
 void BrowserMediaPlayerManager::AddPlayer(MediaPlayerAndroid* player) {
   DCHECK(!GetPlayer(player->player_id()));
   players_.push_back(player);
   if (player->IsRemote()) {
     Send(new MediaPlayerMsg_ConnectedToRemoteDevice(routing_id(),
                                                     player->player_id()));
   }
 }
@@ skipping 126 matching lines @@
   if (player->IsPlaying())
     OnProtectedSurfaceRequested(media_keys_id);
 }
 
 void BrowserMediaPlayerManager::ReleaseFullscreenPlayer(
     MediaPlayerAndroid* player) {
     player->Release();
 }
 
 }  // namespace content