| Index: media/cdm/cdm_adapter.cc
|
| diff --git a/media/cdm/cdm_adapter.cc b/media/cdm/cdm_adapter.cc
|
| index 4e40ae89dd849f2a1780c322b455853443c3c10b..1f25a4bcb98fd3a51316a20d823634caab6dc975 100644
|
| --- a/media/cdm/cdm_adapter.cc
|
| +++ b/media/cdm/cdm_adapter.cc
|
| @@ -307,9 +307,8 @@ void* GetCdmHost(int host_interface_version, void* user_data) {
|
| // Current version is supported.
|
| IsSupportedCdmHostVersion(cdm::Host_8::kVersion) &&
|
| // Include all previous supported versions (if any) here.
|
| - IsSupportedCdmHostVersion(cdm::Host_7::kVersion) &&
|
| // One older than the oldest supported version is not supported.
|
| - !IsSupportedCdmHostVersion(cdm::Host_7::kVersion - 1));
|
| + !IsSupportedCdmHostVersion(cdm::Host_8::kVersion - 1));
|
| DCHECK(IsSupportedCdmHostVersion(host_interface_version));
|
|
|
| CdmAdapter* cdm_adapter = static_cast<CdmAdapter*>(user_data);
|
| @@ -317,8 +316,6 @@ void* GetCdmHost(int host_interface_version, void* user_data) {
|
| switch (host_interface_version) {
|
| case cdm::Host_8::kVersion:
|
| return static_cast<cdm::Host_8*>(cdm_adapter);
|
| - case cdm::Host_7::kVersion:
|
| - return static_cast<cdm::Host_7*>(cdm_adapter);
|
| default:
|
| NOTREACHED() << "Unexpected host interface version "
|
| << host_interface_version;
|
|
|