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 fbe3829a814147390c6841394381ce6414572bfa..4533f3959f03738706c51608c5c1efe166c7e481 100644 |
--- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc |
+++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc |
@@ -176,8 +176,6 @@ static media::EmeInitDataType ConvertInitDataType( |
} |
cdm::KeyStatus ConvertKeyStatus(media::CdmKeyInformation::KeyStatus status) { |
- // TODO(jrummell): Remove kOutputNotAllowed, add kOutputRestricted to CDM |
- // interface. http://crbug.com/507791. |
switch (status) { |
case media::CdmKeyInformation::KeyStatus::USABLE: |
return cdm::kUsable; |
@@ -186,11 +184,13 @@ cdm::KeyStatus ConvertKeyStatus(media::CdmKeyInformation::KeyStatus status) { |
case media::CdmKeyInformation::KeyStatus::EXPIRED: |
return cdm::kExpired; |
case media::CdmKeyInformation::KeyStatus::OUTPUT_RESTRICTED: |
- return cdm::kOutputNotAllowed; |
+ return cdm::kOutputRestricted; |
case media::CdmKeyInformation::KeyStatus::OUTPUT_DOWNSCALED: |
return cdm::kOutputDownscaled; |
case media::CdmKeyInformation::KeyStatus::KEY_STATUS_PENDING: |
return cdm::kStatusPending; |
+ case media::CdmKeyInformation::KeyStatus::RELEASED: |
+ return cdm::kReleased; |
} |
NOTREACHED(); |
return cdm::kInternalError; |