Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(588)

Unified Diff: media/base/cdm_initialized_promise.cc

Issue 1407933010: media: Make MediaKeys ref-counted. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/base/cdm_initialized_promise.cc
diff --git a/media/base/cdm_initialized_promise.cc b/media/base/cdm_initialized_promise.cc
index dcc9c79c830c865c5efc974052becce6e0abcf04..d15d514ed3acceec70130385dc610f88b96e94ce 100644
--- a/media/base/cdm_initialized_promise.cc
+++ b/media/base/cdm_initialized_promise.cc
@@ -6,17 +6,17 @@
namespace media {
-CdmInitializedPromise::CdmInitializedPromise(const CdmCreatedCB& cdm_created_cb,
- scoped_ptr<MediaKeys> cdm)
- : cdm_created_cb_(cdm_created_cb), cdm_(cdm.Pass()) {
-}
+CdmInitializedPromise::CdmInitializedPromise(
+ const CdmCreatedCB& cdm_created_cb,
+ const scoped_refptr<MediaKeys>& cdm)
+ : cdm_created_cb_(cdm_created_cb), cdm_(cdm) {}
CdmInitializedPromise::~CdmInitializedPromise() {
}
void CdmInitializedPromise::resolve() {
MarkPromiseSettled();
- cdm_created_cb_.Run(cdm_.Pass(), "");
+ cdm_created_cb_.Run(cdm_, "");
}
void CdmInitializedPromise::reject(MediaKeys::Exception exception_code,

Powered by Google App Engine
This is Rietveld 408576698