| 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 200a132449f66c9d24d2d8a6faabce1d16be98f1..31e9211a10b47fd8b8cabd42b4682ceba83db747 100644
|
| --- a/media/cdm/ppapi/supported_cdm_versions.h
|
| +++ b/media/cdm/ppapi/supported_cdm_versions.h
|
| @@ -10,7 +10,7 @@
|
| namespace media {
|
|
|
| bool IsSupportedCdmModuleVersion(int version) {
|
| - switch(version) {
|
| + switch (version) {
|
| // Latest.
|
| case CDM_MODULE_VERSION:
|
| return true;
|
| @@ -21,10 +21,11 @@ bool IsSupportedCdmModuleVersion(int version) {
|
|
|
| bool IsSupportedCdmInterfaceVersion(int version) {
|
| static_assert(cdm::ContentDecryptionModule::kVersion ==
|
| - cdm::ContentDecryptionModule_6::kVersion,
|
| + cdm::ContentDecryptionModule_7::kVersion,
|
| "update the code below");
|
| switch(version) {
|
| // Supported versions in decreasing order.
|
| + case cdm::ContentDecryptionModule_7::kVersion:
|
| case cdm::ContentDecryptionModule_6::kVersion:
|
| return true;
|
| default:
|
| @@ -34,10 +35,11 @@ bool IsSupportedCdmInterfaceVersion(int version) {
|
|
|
| bool IsSupportedCdmHostVersion(int version) {
|
| static_assert(cdm::ContentDecryptionModule::Host::kVersion ==
|
| - cdm::ContentDecryptionModule_6::Host::kVersion,
|
| + cdm::ContentDecryptionModule_7::Host::kVersion,
|
| "update the code below");
|
| switch(version) {
|
| // Supported versions in decreasing order.
|
| + case cdm::Host_7::kVersion:
|
| case cdm::Host_6::kVersion:
|
| return true;
|
| default:
|
|
|