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

Unified Diff: media/blink/cdm_session_adapter.cc

Issue 1407933010: media: Make MediaKeys ref-counted. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 5 years, 1 month 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
« no previous file with comments | « media/blink/cdm_session_adapter.h ('k') | media/cdm/aes_decryptor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/cdm_session_adapter.cc
diff --git a/media/blink/cdm_session_adapter.cc b/media/blink/cdm_session_adapter.cc
index 4dcfe96e51d9b9cb87c1f870bb3409ce9df6acf4..e2603401a05105a78f84b34ab34a92bc3f1f3d8e 100644
--- a/media/blink/cdm_session_adapter.cc
+++ b/media/blink/cdm_session_adapter.cc
@@ -128,11 +128,10 @@ const std::string& CdmSessionAdapter::GetKeySystemUMAPrefix() const {
return key_system_uma_prefix_;
}
-void CdmSessionAdapter::OnCdmCreated(
- const std::string& key_system,
- base::TimeTicks start_time,
- scoped_ptr<MediaKeys> cdm,
- const std::string& error_message) {
+void CdmSessionAdapter::OnCdmCreated(const std::string& key_system,
+ base::TimeTicks start_time,
+ const scoped_refptr<MediaKeys>& cdm,
+ const std::string& error_message) {
DVLOG(2) << __FUNCTION__;
DCHECK(!cdm_);
@@ -155,7 +154,7 @@ void CdmSessionAdapter::OnCdmCreated(
// Only report time for successful CDM creation.
ReportTimeToCreateCdmUMA(base::TimeTicks::Now() - start_time);
- cdm_ = cdm.Pass();
+ cdm_ = cdm;
cdm_created_result_->completeWithContentDecryptionModule(
new WebContentDecryptionModuleImpl(this));
« no previous file with comments | « media/blink/cdm_session_adapter.h ('k') | media/cdm/aes_decryptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698