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

Unified Diff: chromecast/media/cdm/cast_cdm_proxy.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 | « chromecast/media/cdm/cast_cdm_proxy.h ('k') | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/media/cdm/cast_cdm_proxy.cc
diff --git a/chromecast/media/cdm/cast_cdm_proxy.cc b/chromecast/media/cdm/cast_cdm_proxy.cc
index 81b3e0ac5e5071ab3be998858472ee5bbdac7046..28bd499f078e47e669b8052a04229d090dfb3399 100644
--- a/chromecast/media/cdm/cast_cdm_proxy.cc
+++ b/chromecast/media/cdm/cast_cdm_proxy.cc
@@ -108,7 +108,7 @@ void CastCdmProxy::SetServerCertificate(
}
void CastCdmProxy::CreateSessionAndGenerateRequest(
- ::media::MediaKeys::SessionType session_type,
+ ::media::ContentDecryptionModule::SessionType session_type,
::media::EmeInitDataType init_data_type,
const std::vector<uint8_t>& init_data,
std::unique_ptr<::media::NewSessionCdmPromise> promise) {
@@ -119,7 +119,7 @@ void CastCdmProxy::CreateSessionAndGenerateRequest(
}
void CastCdmProxy::LoadSession(
- ::media::MediaKeys::SessionType session_type,
+ ::media::ContentDecryptionModule::SessionType session_type,
const std::string& session_id,
std::unique_ptr<::media::NewSessionCdmPromise> promise) {
DCHECK(thread_checker_.CalledOnValidThread());
« no previous file with comments | « chromecast/media/cdm/cast_cdm_proxy.h ('k') | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698