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

Unified Diff: media/crypto/aes_decryptor.cc

Issue 10539150: Add Decryptor interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 6 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/crypto/aes_decryptor.h ('k') | media/crypto/aes_decryptor_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/crypto/aes_decryptor.cc
diff --git a/media/crypto/aes_decryptor.cc b/media/crypto/aes_decryptor.cc
index 49275fb7f031db0c45b46da9d61bffbe179f493c..129bc330131585c2a77a66dc7ab8b96fb96c76e6 100644
--- a/media/crypto/aes_decryptor.cc
+++ b/media/crypto/aes_decryptor.cc
@@ -12,7 +12,7 @@
#include "crypto/symmetric_key.h"
#include "media/base/decoder_buffer.h"
#include "media/base/decrypt_config.h"
-#include "media/crypto/decryptor_client.h"
+#include "media/base/decryptor_client.h"
namespace media {
@@ -89,7 +89,7 @@ void AesDecryptor::AddKey(const std::string& key_system,
const int kSupportedKeyLength = 16; // 128-bit key.
if (key_length != kSupportedKeyLength) {
DVLOG(1) << "Invalid key length: " << key_length;
- client_->KeyError(key_system, session_id, kUnknownError, 0);
+ client_->KeyError(key_system, session_id, Decryptor::kUnknownError, 0);
return;
}
@@ -110,7 +110,7 @@ void AesDecryptor::AddKey(const std::string& key_system,
crypto::SymmetricKey::AES, key_string);
if (!symmetric_key) {
DVLOG(1) << "Could not import key.";
- client_->KeyError(key_system, session_id, kUnknownError, 0);
+ client_->KeyError(key_system, session_id, Decryptor::kUnknownError, 0);
return;
}
« no previous file with comments | « media/crypto/aes_decryptor.h ('k') | media/crypto/aes_decryptor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698