media: Make MediaKeys ref-counted.

content/renderer/media/crypto/ppapi_decryptor.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/crypto/ppapi_decryptor.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 37 matching lines @@
 
   if (!pepper_cdm_wrapper) {
     std::string message =
         "Unable to create the CDM for the key system " + key_system + ".";
     DLOG(ERROR) << message;
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(cdm_created_cb, nullptr, message));
     return;
   }
 
-  scoped_ptr<PpapiDecryptor> ppapi_decryptor(
+  scoped_refptr<PpapiDecryptor> ppapi_decryptor(
       new PpapiDecryptor(pepper_cdm_wrapper.Pass(), session_message_cb,
                          session_closed_cb, legacy_session_error_cb,
                          session_keys_change_cb, session_expiration_update_cb));
 
-  // PpapiDecryptor ownership passed to the promise, but keep a copy in order
-  // to call InitializeCdm().
-  PpapiDecryptor* ppapi_decryptor_copy = ppapi_decryptor.get();
+  // |ppapi_decryptor| ownership is passed to the promise.
   scoped_ptr<media::CdmInitializedPromise> promise(
-      new media::CdmInitializedPromise(cdm_created_cb, ppapi_decryptor.Pass()));
-  ppapi_decryptor_copy->InitializeCdm(key_system, allow_distinctive_identifier,
-                                      allow_persistent_state, promise.Pass());
+      new media::CdmInitializedPromise(cdm_created_cb, ppapi_decryptor));
+
+  ppapi_decryptor->InitializeCdm(key_system, allow_distinctive_identifier,
+                                 allow_persistent_state, promise.Pass());
 }
 
 PpapiDecryptor::PpapiDecryptor(
     scoped_ptr<PepperCdmWrapper> pepper_cdm_wrapper,
     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)
     : pepper_cdm_wrapper_(pepper_cdm_wrapper.Pass()),
@@ skipping 369 matching lines @@
   DCHECK(render_task_runner_->BelongsToCurrentThread());
   pepper_cdm_wrapper_.reset();
 }
 
 ContentDecryptorDelegate* PpapiDecryptor::CdmDelegate() {
   DCHECK(render_task_runner_->BelongsToCurrentThread());
   return (pepper_cdm_wrapper_) ? pepper_cdm_wrapper_->GetCdmDelegate() : NULL;
 }
 
 }  // namespace content