media: Make MediaKeys ref-counted.

media/mojo/services/mojo_cdm.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 "media/mojo/services/mojo_cdm.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "media/base/cdm_context.h"
 #include "media/base/cdm_key_information.h"
@@ skipping 17 matching lines @@
     const std::string& key_system,
     const GURL& security_origin,
     const media::CdmConfig& cdm_config,
     interfaces::ContentDecryptionModulePtr remote_cdm,
     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) {
-  scoped_ptr<MojoCdm> mojo_cdm(
+  scoped_refptr<MojoCdm> mojo_cdm(
       new MojoCdm(remote_cdm.Pass(), session_message_cb, session_closed_cb,
                   legacy_session_error_cb, session_keys_change_cb,
                   session_expiration_update_cb));
 
-  // |mojo_cdm|'s ownership will be passed to the promise. Get a raw pointer
-  // here in order to call Initialize().
-  MojoCdm* mojo_cdm_ptr = mojo_cdm.get();
+  // |mojo_cdm| ownership is passed to the promise.
   scoped_ptr<CdmInitializedPromise> promise(
-      new CdmInitializedPromise(cdm_created_cb, mojo_cdm.Pass()));
-  mojo_cdm_ptr->InitializeCdm(key_system, security_origin, cdm_config,
-                              promise.Pass());
+      new CdmInitializedPromise(cdm_created_cb, mojo_cdm));
+
+  mojo_cdm->InitializeCdm(key_system, security_origin, cdm_config,
+                          promise.Pass());
 }
 
 MojoCdm::MojoCdm(interfaces::ContentDecryptionModulePtr remote_cdm,
                  const SessionMessageCB& session_message_cb,
                  const SessionClosedCB& session_closed_cb,
                  const LegacySessionErrorCB& legacy_session_error_cb,
                  const SessionKeysChangeCB& session_keys_change_cb,
                  const SessionExpirationUpdateCB& session_expiration_update_cb)
     : remote_cdm_(remote_cdm.Pass()),
       binding_(this),
@@ skipping 171 matching lines @@
     RejectPromise(promise.Pass(), result.Pass());
     return;
   }
 
   DCHECK_NE(CdmContext::kInvalidCdmId, cdm_id);
   cdm_id_ = cdm_id;
   promise->resolve();
 }
 
 }  // namespace media