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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/mojo/services/mojo_cdm_service.cc

Issue 1407933010: media: Make MediaKeys ref-counted. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address timav@'s comments. 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
« media/mojo/services/mojo_cdm_service.h ('K') | « media/mojo/services/mojo_cdm_service.h ('k') | media/test/pipeline_integration_test.cc » ('j') | media/test/pipeline_integration_test.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_cdm_service.cc
diff --git a/media/mojo/services/mojo_cdm_service.cc b/media/mojo/services/mojo_cdm_service.cc
index 1d614c5792012d6c2f3ad2d05ba451769ab42dfd..86fa303e7692bd66edece9760aaa83b2b6810d41 100644
--- a/media/mojo/services/mojo_cdm_service.cc
+++ b/media/mojo/services/mojo_cdm_service.cc
@@ -138,7 +138,7 @@ CdmContext* MojoCdmService::GetCdmContext() {
void MojoCdmService::OnCdmCreated(int cdm_id,
scoped_ptr<SimpleMojoCdmPromise> promise,
- scoped_ptr<MediaKeys> cdm,
+ const scoped_refptr<MediaKeys>& cdm,
const std::string& error_message) {
// TODO(xhwang): This should not happen when KeySystemInfo is properly
// populated. See http://crbug.com/469366
@@ -147,7 +147,7 @@ void MojoCdmService::OnCdmCreated(int cdm_id,
return;
}
- cdm_ = cdm.Pass();
+ cdm_ = cdm;
cdm_id_ = cdm_id;
context_->RegisterCdm(cdm_id_, this);
promise->resolve();
« media/mojo/services/mojo_cdm_service.h ('K') | « media/mojo/services/mojo_cdm_service.h ('k') | media/test/pipeline_integration_test.cc » ('j') | media/test/pipeline_integration_test.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698