Index: media/cdm/ppapi/cdm_adapter.cc |
diff --git a/media/cdm/ppapi/cdm_adapter.cc b/media/cdm/ppapi/cdm_adapter.cc |
index 1d765d07d95bef207b5c0a14aa8b7082794aff1c..863352f632dd8699990061a7bfb8396476359ade 100644 |
--- a/media/cdm/ppapi/cdm_adapter.cc |
+++ b/media/cdm/ppapi/cdm_adapter.cc |
@@ -97,14 +97,18 @@ PP_DecryptResult CdmStatusToPpDecryptResult(cdm::Status status) { |
switch (status) { |
case cdm::kSuccess: |
return PP_DECRYPTRESULT_SUCCESS; |
- case cdm::kNoKey: |
- return PP_DECRYPTRESULT_DECRYPT_NOKEY; |
case cdm::kNeedMoreData: |
return PP_DECRYPTRESULT_NEEDMOREDATA; |
+ case cdm::kNoKey: |
+ return PP_DECRYPTRESULT_DECRYPT_NOKEY; |
+ case cdm::kSessionError: |
ddorwin
2015/04/23 00:33:42
This also appears to only be used by the Initializ
jrummell
2015/04/23 21:10:15
Fixed.
|
+ return PP_DECRYPTRESULT_SESSION_ERROR; |
case cdm::kDecryptError: |
return PP_DECRYPTRESULT_DECRYPT_ERROR; |
case cdm::kDecodeError: |
return PP_DECRYPTRESULT_DECODE_ERROR; |
+ case cdm::kDeferredInitialization: |
ddorwin
2015/04/23 00:33:42
This is only expected from the Initialize* methods
jrummell
2015/04/23 21:10:15
Fixed.
|
+ return PP_DECRYPTRESULT_DEFERRED_INITIALIZATION; |
default: |
PP_NOTREACHED(); |
return PP_DECRYPTRESULT_DECODE_ERROR; |