media: Make MediaKeys ref-counted.

content/renderer/media/crypto/proxy_media_keys.cc

 // Copyright 2014 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/crypto/proxy_media_keys.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 11 matching lines @@
     const GURL& security_origin,
     bool use_hw_secure_codecs,
     RendererCdmManager* manager,
     const media::SessionMessageCB& session_message_cb,
     const media::SessionClosedCB& session_closed_cb,
     const media::LegacySessionErrorCB& legacy_session_error_cb,
     const media::SessionKeysChangeCB& session_keys_change_cb,
     const media::SessionExpirationUpdateCB& session_expiration_update_cb,
     const media::CdmCreatedCB& cdm_created_cb) {
   DCHECK(manager);
-  scoped_ptr<ProxyMediaKeys> proxy_media_keys(new ProxyMediaKeys(
+  scoped_refptr<ProxyMediaKeys> proxy_media_keys(new ProxyMediaKeys(
       manager, session_message_cb, session_closed_cb, legacy_session_error_cb,
       session_keys_change_cb, session_expiration_update_cb));
 
-  // ProxyMediaKeys ownership passed to the promise, but keep a copy in order
-  // to call InitializeCdm().
-  ProxyMediaKeys* proxy_media_keys_copy = proxy_media_keys.get();
+  // ProxyMediaKeys ownership passed to the promise.
   scoped_ptr<media::CdmInitializedPromise> promise(
-      new media::CdmInitializedPromise(cdm_created_cb,
-                                       proxy_media_keys.Pass()));
-  proxy_media_keys_copy->InitializeCdm(key_system, security_origin,
-                                       use_hw_secure_codecs, promise.Pass());
-}
+      new media::CdmInitializedPromise(cdm_created_cb, proxy_media_keys));
 
-ProxyMediaKeys::~ProxyMediaKeys() {
-  manager_->DestroyCdm(cdm_id_);
-  manager_->UnregisterMediaKeys(cdm_id_);
-  cdm_promise_adapter_.Clear();
+  proxy_media_keys->InitializeCdm(key_system, security_origin,
+                                  use_hw_secure_codecs, promise.Pass());
 }
 
 void ProxyMediaKeys::SetServerCertificate(
     const std::vector<uint8_t>& certificate,
     scoped_ptr<media::SimpleCdmPromise> promise) {
   uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
   manager_->SetServerCertificate(cdm_id_, promise_id, certificate);
 }
 
 void ProxyMediaKeys::CreateSessionAndGenerateRequest(
@@ skipping 126 matching lines @@
     const media::SessionExpirationUpdateCB& session_expiration_update_cb)
     : manager_(manager),
       session_message_cb_(session_message_cb),
       session_closed_cb_(session_closed_cb),
       legacy_session_error_cb_(legacy_session_error_cb),
       session_keys_change_cb_(session_keys_change_cb),
       session_expiration_update_cb_(session_expiration_update_cb) {
   cdm_id_ = manager->RegisterMediaKeys(this);
 }
 
+ProxyMediaKeys::~ProxyMediaKeys() {
+  manager_->DestroyCdm(cdm_id_);
+  manager_->UnregisterMediaKeys(cdm_id_);
+  cdm_promise_adapter_.Clear();
+}
+
 void ProxyMediaKeys::InitializeCdm(
     const std::string& key_system,
     const GURL& security_origin,
     bool use_hw_secure_codecs,
     scoped_ptr<media::SimpleCdmPromise> promise) {
   uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
   manager_->InitializeCdm(cdm_id_, promise_id, this, key_system,
                           security_origin, use_hw_secure_codecs);
 }
 
 }  // namespace content