Index: media/cdm/cdm_wrapper.h |
diff --git a/media/cdm/cdm_wrapper.h b/media/cdm/cdm_wrapper.h |
index 75a1fe0b090546e412b827d758bdf75f02781dce..ed88f494ceb021874ffa1bc7e975aac766567d33 100644 |
--- a/media/cdm/cdm_wrapper.h |
+++ b/media/cdm/cdm_wrapper.h |
@@ -246,39 +246,6 @@ class CdmWrapperImpl : public CdmWrapper { |
DISALLOW_COPY_AND_ASSIGN(CdmWrapperImpl); |
}; |
-// Overrides for the cdm::Host_7 methods. |
-// TODO(jrummell): Remove these once Host_7 interface is removed. |
- |
-template <> |
-void CdmWrapperImpl<cdm::ContentDecryptionModule_7>::Initialize( |
- bool allow_distinctive_identifier, |
- bool allow_persistent_state) {} |
- |
-template <> |
-void CdmWrapperImpl<cdm::ContentDecryptionModule_7>:: |
- CreateSessionAndGenerateRequest(uint32_t promise_id, |
- cdm::SessionType session_type, |
- cdm::InitDataType init_data_type, |
- const uint8_t* init_data, |
- uint32_t init_data_size) { |
- std::string init_data_type_as_string = "unknown"; |
- switch (init_data_type) { |
- case cdm::kCenc: |
- init_data_type_as_string = "cenc"; |
- break; |
- case cdm::kKeyIds: |
- init_data_type_as_string = "keyids"; |
- break; |
- case cdm::kWebM: |
- init_data_type_as_string = "webm"; |
- break; |
- } |
- |
- cdm_->CreateSessionAndGenerateRequest( |
- promise_id, session_type, &init_data_type_as_string[0], |
- init_data_type_as_string.length(), init_data, init_data_size); |
-} |
- |
CdmWrapper* CdmWrapper::Create(CreateCdmFunc create_cdm_func, |
const char* key_system, |
uint32_t key_system_size, |
@@ -296,10 +263,8 @@ CdmWrapper* CdmWrapper::Create(CreateCdmFunc create_cdm_func, |
cdm::ContentDecryptionModule_8::kVersion + 1) && |
IsSupportedCdmInterfaceVersion( |
cdm::ContentDecryptionModule_8::kVersion) && |
- IsSupportedCdmInterfaceVersion( |
- cdm::ContentDecryptionModule_7::kVersion) && |
!IsSupportedCdmInterfaceVersion( |
- cdm::ContentDecryptionModule_7::kVersion - 1)); |
+ cdm::ContentDecryptionModule_8::kVersion - 1)); |
// Try to create the CDM using the latest CDM interface version. |
CdmWrapper* cdm_wrapper = |
@@ -307,14 +272,6 @@ CdmWrapper* CdmWrapper::Create(CreateCdmFunc create_cdm_func, |
create_cdm_func, key_system, key_system_size, get_cdm_host_func, |
user_data); |
- // If |cdm_wrapper| is NULL, try to create the CDM using older supported |
- // versions of the CDM interface here. |
- if (!cdm_wrapper) { |
- cdm_wrapper = CdmWrapperImpl<cdm::ContentDecryptionModule_7>::Create( |
- create_cdm_func, key_system, key_system_size, get_cdm_host_func, |
- user_data); |
- } |
- |
return cdm_wrapper; |
} |