Index: media/blink/cdm_session_adapter.cc |
diff --git a/media/blink/cdm_session_adapter.cc b/media/blink/cdm_session_adapter.cc |
index f4f3906efdcd2e5f56976b6ffab6c9ae652beb39..30d0be687aad3c0edad26d7e30347d55c24d305a 100644 |
--- a/media/blink/cdm_session_adapter.cc |
+++ b/media/blink/cdm_session_adapter.cc |
@@ -30,17 +30,15 @@ CdmSessionAdapter::~CdmSessionAdapter() {} |
void CdmSessionAdapter::CreateCdm( |
CdmFactory* cdm_factory, |
const std::string& key_system, |
- bool allow_distinctive_identifier, |
- bool allow_persistent_state, |
const GURL& security_origin, |
+ const CdmConfig& cdm_config, |
blink::WebContentDecryptionModuleResult result) { |
// Note: WebContentDecryptionModuleImpl::Create() calls this method without |
// holding a reference to the CdmSessionAdapter. Bind OnCdmCreated() with |
// |this| instead of |weak_this| to prevent |this| from being destructed. |
base::WeakPtr<CdmSessionAdapter> weak_this = weak_ptr_factory_.GetWeakPtr(); |
cdm_factory->Create( |
- key_system, allow_distinctive_identifier, allow_persistent_state, |
- security_origin, |
+ key_system, security_origin, cdm_config, |
ddorwin
2015/05/13 06:03:21
One great thing about the config is that the bools
sandersd (OOO until July 31)
2015/05/14 00:06:57
Acknowledged.
|
base::Bind(&CdmSessionAdapter::OnSessionMessage, weak_this), |
base::Bind(&CdmSessionAdapter::OnSessionClosed, weak_this), |
base::Bind(&CdmSessionAdapter::OnLegacySessionError, weak_this), |