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

Unified Diff: media/blink/webcontentdecryptionmodule_impl.cc

Issue 1131753003: Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update unittest. Created 5 years, 7 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/blink/webcontentdecryptionmodule_impl.cc
diff --git a/media/blink/webcontentdecryptionmodule_impl.cc b/media/blink/webcontentdecryptionmodule_impl.cc
index 6284602ef137a4ab7033a000f3dc2ea39bd16c46..cc2d50a8c49b816508130c1c73575c7c26d9c4ef 100644
--- a/media/blink/webcontentdecryptionmodule_impl.cc
+++ b/media/blink/webcontentdecryptionmodule_impl.cc
@@ -25,9 +25,8 @@ namespace media {
void WebContentDecryptionModuleImpl::Create(
media::CdmFactory* cdm_factory,
const base::string16& key_system,
- bool allow_distinctive_identifier,
- bool allow_persistent_state,
const blink::WebSecurityOrigin& security_origin,
+ const CdmConfig& cdm_config,
blink::WebContentDecryptionModuleResult result) {
DCHECK(!security_origin.isNull());
DCHECK(!key_system.empty());
@@ -68,9 +67,8 @@ void WebContentDecryptionModuleImpl::Create(
// |result|), it will keep a reference to |adapter|. Otherwise, |adapter| will
// be destructed.
scoped_refptr<CdmSessionAdapter> adapter(new CdmSessionAdapter());
- adapter->CreateCdm(cdm_factory, key_system_ascii,
- allow_distinctive_identifier, allow_persistent_state,
- security_origin_as_gurl, result);
+ adapter->CreateCdm(cdm_factory, key_system_ascii, security_origin_as_gurl,
+ cdm_config, result);
}
WebContentDecryptionModuleImpl::WebContentDecryptionModuleImpl(

Powered by Google App Engine
This is Rietveld 408576698