Index: media/cdm/ppapi/cdm_adapter.cc |
diff --git a/media/cdm/ppapi/cdm_adapter.cc b/media/cdm/ppapi/cdm_adapter.cc |
index 092ab5443eecd0ad61567a98192ee93574fa9cc0..93479e2595537cf26ae9022e97c9e7e908533f7e 100644 |
--- a/media/cdm/ppapi/cdm_adapter.cc |
+++ b/media/cdm/ppapi/cdm_adapter.cc |
@@ -289,8 +289,6 @@ PP_CdmMessageType CdmMessageTypeToPpMessageType(cdm::MessageType message) { |
} |
PP_CdmKeyStatus CdmKeyStatusToPpKeyStatus(cdm::KeyStatus status) { |
- // TODO(jrummell): Remove kOutputNotAllowed, add kOutputRestricted to CDM |
- // interface. http://crbug.com/507791. |
switch (status) { |
case cdm::kUsable: |
return PP_CDMKEYSTATUS_USABLE; |
@@ -298,12 +296,14 @@ PP_CdmKeyStatus CdmKeyStatusToPpKeyStatus(cdm::KeyStatus status) { |
return PP_CDMKEYSTATUS_INVALID; |
case cdm::kExpired: |
return PP_CDMKEYSTATUS_EXPIRED; |
- case cdm::kOutputNotAllowed: |
+ case cdm::kOutputRestricted: |
return PP_CDMKEYSTATUS_OUTPUTRESTRICTED; |
case cdm::kOutputDownscaled: |
return PP_CDMKEYSTATUS_OUTPUTDOWNSCALED; |
case cdm::kStatusPending: |
return PP_CDMKEYSTATUS_STATUSPENDING; |
+ case cdm::kReleased: |
+ return PP_CDMKEYSTATUS_RELEASED; |
} |
PP_NOTREACHED(); |