Encrypted Media: Destroy CDM in ProxyMediaKeys' dtor.

content/renderer/media/android/proxy_media_keys.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/proxy_media_keys.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 14 matching lines @@
       media_keys_id_(media_keys_id),
       session_created_cb_(session_created_cb),
       session_message_cb_(session_message_cb),
       session_ready_cb_(session_ready_cb),
       session_closed_cb_(session_closed_cb),
       session_error_cb_(session_error_cb) {
   DCHECK(manager_);
 }
 
 ProxyMediaKeys::~ProxyMediaKeys() {
-  manager_->CancelAllPendingSessionCreations(media_keys_id_);
+  manager_->DestroyCdm(media_keys_id_);
 }
 
 void ProxyMediaKeys::InitializeCDM(const std::string& key_system,
                                    const GURL& frame_url) {
 #if defined(ENABLE_PEPPER_CDMS)
   NOTIMPLEMENTED();
 #elif defined(OS_ANDROID)
   std::vector<uint8> uuid = GetUUID(key_system);
   DCHECK(!uuid.empty());
   manager_->InitializeCDM(media_keys_id_, this, uuid, frame_url);
@@ skipping 65 matching lines @@
   session_closed_cb_.Run(session_id);
 }
 
 void ProxyMediaKeys::OnSessionError(uint32 session_id,
                                     media::MediaKeys::KeyError error_code,
                                     int system_code) {
   session_error_cb_.Run(session_id, error_code, system_code);
 }
 
 }  // namespace content