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

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

Issue 2568463003: media: Rename MediaKeys to ContentDecryptionModule (Closed)
Patch Set: comments addressed Created 4 years 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/mojo/services/mojo_cdm_service_context.h ('k') | media/mojo/services/mojo_decryptor_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_cdm_service_context.cc
diff --git a/media/mojo/services/mojo_cdm_service_context.cc b/media/mojo/services/mojo_cdm_service_context.cc
index 7a549653d027406c181660e653e3964f1a4c20cf..5b8880b6d364583f16a0a8931844158f63b7d9e1 100644
--- a/media/mojo/services/mojo_cdm_service_context.cc
+++ b/media/mojo/services/mojo_cdm_service_context.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/logging.h"
-#include "media/base/media_keys.h"
+#include "media/base/content_decryption_module.h"
#include "media/mojo/services/mojo_cdm_service.h"
namespace media {
@@ -32,7 +32,8 @@ void MojoCdmServiceContext::UnregisterCdm(int cdm_id) {
cdm_services_.erase(cdm_id);
}
-scoped_refptr<MediaKeys> MojoCdmServiceContext::GetCdm(int cdm_id) {
+scoped_refptr<ContentDecryptionModule> MojoCdmServiceContext::GetCdm(
+ int cdm_id) {
auto cdm_service = cdm_services_.find(cdm_id);
if (cdm_service == cdm_services_.end()) {
LOG(ERROR) << "CDM service not found: " << cdm_id;
« no previous file with comments | « media/mojo/services/mojo_cdm_service_context.h ('k') | media/mojo/services/mojo_decryptor_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698