Index: webkit/media/crypto/ppapi_decryptor.cc |
diff --git a/webkit/media/crypto/ppapi_decryptor.cc b/webkit/media/crypto/ppapi_decryptor.cc |
index ec19cc1d56110f652ce2be33835d368ea3f4cbb1..65d327fc6a2ddd7e34003e2d8d9058ffe8afdf6d 100644 |
--- a/webkit/media/crypto/ppapi_decryptor.cc |
+++ b/webkit/media/crypto/ppapi_decryptor.cc |
@@ -41,14 +41,10 @@ bool PpapiDecryptor::GenerateKeyRequest(const std::string& key_system, |
// TODO(xhwang): Finalize the data type for |init_data| to avoid unnecessary |
// data type conversions. |
- if (!cdm_plugin_->GenerateKeyRequest( |
+ cdm_plugin_->GenerateKeyRequest( |
key_system, |
std::string(reinterpret_cast<const char*>(init_data), |
- init_data_length))) { |
- ReportFailureToCallPlugin(key_system, ""); |
- return false; |
- } |
- |
+ init_data_length)); |
return true; |
} |
@@ -62,13 +58,11 @@ void PpapiDecryptor::AddKey(const std::string& key_system, |
DCHECK(render_loop_proxy_->BelongsToCurrentThread()); |
DCHECK(cdm_plugin_); |
- if (!cdm_plugin_->AddKey(session_id, |
- std::string(reinterpret_cast<const char*>(key), |
- key_length), |
- std::string(reinterpret_cast<const char*>(init_data), |
- init_data_length))) { |
- ReportFailureToCallPlugin(key_system, session_id); |
- } |
+ cdm_plugin_->AddKey(session_id, |
+ std::string(reinterpret_cast<const char*>(key), |
+ key_length), |
+ std::string(reinterpret_cast<const char*>(init_data), |
+ init_data_length)); |
} |
void PpapiDecryptor::CancelKeyRequest(const std::string& key_system, |
@@ -77,8 +71,7 @@ void PpapiDecryptor::CancelKeyRequest(const std::string& key_system, |
DCHECK(render_loop_proxy_->BelongsToCurrentThread()); |
DCHECK(cdm_plugin_); |
- if (!cdm_plugin_->CancelKeyRequest(session_id)) |
- ReportFailureToCallPlugin(key_system, session_id); |
+ cdm_plugin_->CancelKeyRequest(session_id); |
} |
void PpapiDecryptor::Decrypt( |
@@ -93,17 +86,10 @@ void PpapiDecryptor::Decrypt( |
return; |
} |
- if (!cdm_plugin_->Decrypt(encrypted, decrypt_cb)) |
- decrypt_cb.Run(kError, NULL); |
+ cdm_plugin_->Decrypt(encrypted, decrypt_cb); |
} |
void PpapiDecryptor::Stop() { |
} |
-void PpapiDecryptor::ReportFailureToCallPlugin(const std::string& key_system, |
- const std::string& session_id) { |
- DVLOG(1) << "Failed to call plugin."; |
- client_->KeyError(key_system, session_id, kUnknownError, 0); |
-} |
- |
} // namespace webkit_media |