| Index: media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
|
| diff --git a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
|
| index e7f322b0614a4eb9746da6c221aa027451217189..026fd0c03ebb69e193dcb3c72026a6a9419cf67d 100644
|
| --- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
|
| +++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
|
| @@ -171,8 +171,6 @@ static media::MediaKeys::SessionType ConvertSessionType(
|
| }
|
|
|
| cdm::KeyStatus ConvertKeyStatus(media::CdmKeyInformation::KeyStatus status) {
|
| - // TODO(jrummell): Update OUTPUT_DOWNSCALED and KEY_STATUS_PENDING once CDM
|
| - // interface supports them. http://crbug.com/450861
|
| switch (status) {
|
| case media::CdmKeyInformation::KeyStatus::USABLE:
|
| return cdm::kUsable;
|
| @@ -183,9 +181,9 @@ cdm::KeyStatus ConvertKeyStatus(media::CdmKeyInformation::KeyStatus status) {
|
| case media::CdmKeyInformation::KeyStatus::OUTPUT_NOT_ALLOWED:
|
| return cdm::kOutputNotAllowed;
|
| case media::CdmKeyInformation::KeyStatus::OUTPUT_DOWNSCALED:
|
| - return cdm::kInternalError;
|
| + return cdm::kOutputDownscaled;
|
| case media::CdmKeyInformation::KeyStatus::KEY_STATUS_PENDING:
|
| - return cdm::kInternalError;
|
| + return cdm::kStatusPending;
|
| }
|
| NOTIMPLEMENTED();
|
| return cdm::kInternalError;
|
|
|