4 files changed, 10 insertions, 7 deletions
diff --git a/media/base/cdm_key_information.h b/media/base/cdm_key_information.h
index 2ad6da4..c7ee225 100644
--- a/media/base/cdm_key_information.h
+++ b/media/base/cdm_key_information.h
@@ -21,7 +21,8 @@ struct MEDIA_EXPORT CdmKeyInformation {
     OUTPUT_RESTRICTED = 3,
     OUTPUT_DOWNSCALED = 4,
     KEY_STATUS_PENDING = 5,
-    KEY_STATUS_MAX = KEY_STATUS_PENDING
+    RELEASED = 6,
+    KEY_STATUS_MAX = RELEASED
   };
 
   CdmKeyInformation();
diff --git a/media/blink/webcontentdecryptionmodulesession_impl.cc b/media/blink/webcontentdecryptionmodulesession_impl.cc
index 55b69d5..1539231 100644
--- a/media/blink/webcontentdecryptionmodulesession_impl.cc
+++ b/media/blink/webcontentdecryptionmodulesession_impl.cc
@@ -75,6 +75,8 @@ static blink::WebEncryptedMediaKeyInformation::KeyStatus convertStatus(
           OutputDownscaled;
     case media::CdmKeyInformation::KEY_STATUS_PENDING:
       return blink::WebEncryptedMediaKeyInformation::KeyStatus::StatusPending;
+    case media::CdmKeyInformation::RELEASED:
+      return blink::WebEncryptedMediaKeyInformation::KeyStatus::Released;
   }
 
   NOTREACHED();
diff --git a/media/cdm/ppapi/cdm_adapter.cc b/media/cdm/ppapi/cdm_adapter.cc
index 092ab54..93479e2 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();
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 fbe3829..4533f39 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;