| Index: media/cdm/ppapi/supported_cdm_versions.h
|
| diff --git a/media/cdm/ppapi/supported_cdm_versions.h b/media/cdm/ppapi/supported_cdm_versions.h
|
| index 8de7a8c2acb5503d4fee4ee592f644c97e74c7d9..fc05345be40ea551f77f46604fd1f9eaa2b0b969 100644
|
| --- a/media/cdm/ppapi/supported_cdm_versions.h
|
| +++ b/media/cdm/ppapi/supported_cdm_versions.h
|
| @@ -21,10 +21,11 @@ bool IsSupportedCdmModuleVersion(int version) {
|
|
|
| bool IsSupportedCdmInterfaceVersion(int version) {
|
| COMPILE_ASSERT(cdm::ContentDecryptionModule::kVersion ==
|
| - cdm::ContentDecryptionModule_5::kVersion,
|
| + cdm::ContentDecryptionModule_6::kVersion,
|
| update_code_below);
|
| switch(version) {
|
| // Supported versions in decreasing order.
|
| + case cdm::ContentDecryptionModule_6::kVersion:
|
| case cdm::ContentDecryptionModule_5::kVersion:
|
| case cdm::ContentDecryptionModule_4::kVersion:
|
| return true;
|
| @@ -35,10 +36,11 @@ bool IsSupportedCdmInterfaceVersion(int version) {
|
|
|
| bool IsSupportedCdmHostVersion(int version) {
|
| COMPILE_ASSERT(cdm::ContentDecryptionModule::Host::kVersion ==
|
| - cdm::ContentDecryptionModule_5::Host::kVersion,
|
| + cdm::ContentDecryptionModule_6::Host::kVersion,
|
| update_code_below);
|
| switch(version) {
|
| // Supported versions in decreasing order.
|
| + case cdm::Host_6::kVersion:
|
| case cdm::Host_5::kVersion:
|
| case cdm::Host_4::kVersion:
|
| return true;
|
|
|