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

Unified Diff: content/renderer/media/cdm/ppapi_decryptor.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 | « chromecast/media/cdm/cast_cdm_proxy.cc ('k') | content/renderer/pepper/content_decryptor_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/cdm/ppapi_decryptor.cc
diff --git a/content/renderer/media/cdm/ppapi_decryptor.cc b/content/renderer/media/cdm/ppapi_decryptor.cc
index dd07e01c24ee6fe79bf9d85cbb478d0bc06ecc2c..b76c0218f156784530d1d611d1fcb7cc769b0745 100644
--- a/content/renderer/media/cdm/ppapi_decryptor.cc
+++ b/content/renderer/media/cdm/ppapi_decryptor.cc
@@ -114,7 +114,8 @@ void PpapiDecryptor::SetServerCertificate(
DCHECK(render_task_runner_->BelongsToCurrentThread());
if (!CdmDelegate()) {
- promise->reject(INVALID_STATE_ERROR, 0, "CDM has failed.");
+ promise->reject(media::CdmPromise::INVALID_STATE_ERROR, 0,
+ "CDM has failed.");
return;
}
@@ -130,7 +131,8 @@ void PpapiDecryptor::CreateSessionAndGenerateRequest(
DCHECK(render_task_runner_->BelongsToCurrentThread());
if (!CdmDelegate()) {
- promise->reject(INVALID_STATE_ERROR, 0, "CDM has failed.");
+ promise->reject(media::CdmPromise::INVALID_STATE_ERROR, 0,
+ "CDM has failed.");
return;
}
@@ -146,7 +148,8 @@ void PpapiDecryptor::LoadSession(
DCHECK(render_task_runner_->BelongsToCurrentThread());
if (!CdmDelegate()) {
- promise->reject(INVALID_STATE_ERROR, 0, "CDM has failed.");
+ promise->reject(media::CdmPromise::INVALID_STATE_ERROR, 0,
+ "CDM has failed.");
return;
}
CdmDelegate()->LoadSession(session_type, session_id, std::move(promise));
@@ -160,7 +163,8 @@ void PpapiDecryptor::UpdateSession(
DCHECK(render_task_runner_->BelongsToCurrentThread());
if (!CdmDelegate()) {
- promise->reject(INVALID_STATE_ERROR, 0, "CDM has failed.");
+ promise->reject(media::CdmPromise::INVALID_STATE_ERROR, 0,
+ "CDM has failed.");
return;
}
CdmDelegate()->UpdateSession(session_id, response, std::move(promise));
@@ -173,7 +177,8 @@ void PpapiDecryptor::CloseSession(
DCHECK(render_task_runner_->BelongsToCurrentThread());
if (!CdmDelegate()) {
- promise->reject(INVALID_STATE_ERROR, 0, "CDM has failed.");
+ promise->reject(media::CdmPromise::INVALID_STATE_ERROR, 0,
+ "CDM has failed.");
return;
}
@@ -187,7 +192,8 @@ void PpapiDecryptor::RemoveSession(
DCHECK(render_task_runner_->BelongsToCurrentThread());
if (!CdmDelegate()) {
- promise->reject(INVALID_STATE_ERROR, 0, "CDM has failed.");
+ promise->reject(media::CdmPromise::INVALID_STATE_ERROR, 0,
+ "CDM has failed.");
return;
}
« no previous file with comments | « chromecast/media/cdm/cast_cdm_proxy.cc ('k') | content/renderer/pepper/content_decryptor_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698