Encrypted Media: Destroy CDM in ProxyMediaKeys' dtor.

content/renderer/media/android/renderer_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/renderer/media/android/renderer_media_player_manager.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "content/common/media/media_player_messages_android.h"
 #include "content/renderer/media/android/proxy_media_keys.h"
@@ skipping 252 matching lines @@
   Send(new MediaKeysHostMsg_UpdateSession(
       routing_id(), media_keys_id, session_id, response));
 }
 
 void RendererMediaPlayerManager::ReleaseSession(int media_keys_id,
                                                 uint32 session_id) {
   Send(new MediaKeysHostMsg_ReleaseSession(
       routing_id(), media_keys_id, session_id));
 }
 
-void RendererMediaPlayerManager::CancelAllPendingSessionCreations(
-    int media_keys_id) {
-  Send(new MediaKeysHostMsg_CancelAllPendingSessionCreations(
-      routing_id(), media_keys_id));
+void RendererMediaPlayerManager::DestroyCdm(int media_keys_id) {
+  Send(new MediaKeysHostMsg_DestroyCdm(routing_id(), media_keys_id));
 }
 
 void RendererMediaPlayerManager::OnSessionCreated(
     int media_keys_id,
     uint32 session_id,
     const std::string& web_session_id) {
   if (web_session_id.length() > kEmeWebSessionIdMaximum) {
     OnSessionError(
         media_keys_id, session_id, media::MediaKeys::kUnknownError, 0);
     return;
@@ skipping 147 matching lines @@
 
     if (player && player->hasVideo()) {
       if (player->UpdateBoundaryRectangle())
         (*changes)[player_it->first] = player->GetBoundaryRectangle();
     }
   }
 }
 #endif  // defined(VIDEO_HOLE)
 
 }  // namespace content