Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(868)

Unified Diff: media/blink/cdm_result_promise_helper.cc

Issue 2444683002: Move MediaKeys::Exception to CdmPromise::Exception (Closed)
Patch Set: include "media/base/media_keys.h" Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/blink/cdm_result_promise_helper.h ('k') | media/blink/new_session_cdm_result_promise.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/cdm_result_promise_helper.cc
diff --git a/media/blink/cdm_result_promise_helper.cc b/media/blink/cdm_result_promise_helper.cc
index 5d0a5e58f2a1b9b6684d1c096abbe6bd017b0c4b..6c4f9effaae4363c726b156d27adf7fd2943d4e2 100644
--- a/media/blink/cdm_result_promise_helper.cc
+++ b/media/blink/cdm_result_promise_helper.cc
@@ -10,21 +10,21 @@
namespace media {
CdmResultForUMA ConvertCdmExceptionToResultForUMA(
- MediaKeys::Exception exception_code) {
+ CdmPromise::Exception exception_code) {
switch (exception_code) {
- case MediaKeys::NOT_SUPPORTED_ERROR:
+ case CdmPromise::NOT_SUPPORTED_ERROR:
return NOT_SUPPORTED_ERROR;
- case MediaKeys::INVALID_STATE_ERROR:
+ case CdmPromise::INVALID_STATE_ERROR:
return INVALID_STATE_ERROR;
- case MediaKeys::INVALID_ACCESS_ERROR:
+ case CdmPromise::INVALID_ACCESS_ERROR:
return INVALID_ACCESS_ERROR;
- case MediaKeys::QUOTA_EXCEEDED_ERROR:
+ case CdmPromise::QUOTA_EXCEEDED_ERROR:
return QUOTA_EXCEEDED_ERROR;
- case MediaKeys::UNKNOWN_ERROR:
+ case CdmPromise::UNKNOWN_ERROR:
return UNKNOWN_ERROR;
- case MediaKeys::CLIENT_ERROR:
+ case CdmPromise::CLIENT_ERROR:
return CLIENT_ERROR;
- case MediaKeys::OUTPUT_ERROR:
+ case CdmPromise::OUTPUT_ERROR:
return OUTPUT_ERROR;
}
NOTREACHED();
@@ -32,26 +32,26 @@ CdmResultForUMA ConvertCdmExceptionToResultForUMA(
}
blink::WebContentDecryptionModuleException ConvertCdmException(
- MediaKeys::Exception exception_code) {
+ CdmPromise::Exception exception_code) {
switch (exception_code) {
- case MediaKeys::NOT_SUPPORTED_ERROR:
+ case CdmPromise::NOT_SUPPORTED_ERROR:
return blink::WebContentDecryptionModuleExceptionNotSupportedError;
- case MediaKeys::INVALID_STATE_ERROR:
+ case CdmPromise::INVALID_STATE_ERROR:
return blink::WebContentDecryptionModuleExceptionInvalidStateError;
// TODO(jrummell): Since InvalidAccess is not returned, thus should be
// renamed to TYPE_ERROR. http://crbug.com/570216#c11.
- case MediaKeys::INVALID_ACCESS_ERROR:
+ case CdmPromise::INVALID_ACCESS_ERROR:
return blink::WebContentDecryptionModuleExceptionTypeError;
- case MediaKeys::QUOTA_EXCEEDED_ERROR:
+ case CdmPromise::QUOTA_EXCEEDED_ERROR:
return blink::WebContentDecryptionModuleExceptionQuotaExceededError;
- case MediaKeys::UNKNOWN_ERROR:
+ case CdmPromise::UNKNOWN_ERROR:
return blink::WebContentDecryptionModuleExceptionUnknownError;
// These are deprecated, and should be removed.
// http://crbug.com/570216#c11.
- case MediaKeys::CLIENT_ERROR:
- case MediaKeys::OUTPUT_ERROR:
+ case CdmPromise::CLIENT_ERROR:
+ case CdmPromise::OUTPUT_ERROR:
break;
}
NOTREACHED();
« no previous file with comments | « media/blink/cdm_result_promise_helper.h ('k') | media/blink/new_session_cdm_result_promise.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698