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

Unified Diff: media/crypto/aes_decryptor_unittest.cc

Issue 11144036: Update Decryptor interface to support audio decoding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove leftover unretained Created 8 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/crypto/aes_decryptor.cc ('k') | media/filters/decrypting_video_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/crypto/aes_decryptor_unittest.cc
diff --git a/media/crypto/aes_decryptor_unittest.cc b/media/crypto/aes_decryptor_unittest.cc
index 0f3537e37bec38cef457eae65139961014550a32..fdeba83d4a52a14bae96034209dce81e46966f4a 100644
--- a/media/crypto/aes_decryptor_unittest.cc
+++ b/media/crypto/aes_decryptor_unittest.cc
@@ -271,7 +271,7 @@ class AesDecryptorTest : public testing::Test {
EXPECT_CALL(*this, BufferDecrypted(AesDecryptor::kSuccess, NotNull()))
.WillOnce(SaveArg<1>(&decrypted));
- decryptor_.Decrypt(encrypted, decrypt_cb_);
+ decryptor_.Decrypt(Decryptor::kVideo, encrypted, decrypt_cb_);
ASSERT_TRUE(decrypted);
ASSERT_EQ(plain_text_size, decrypted->GetDataSize());
EXPECT_EQ(0, memcmp(plain_text, decrypted->GetData(), plain_text_size));
@@ -284,7 +284,7 @@ class AesDecryptorTest : public testing::Test {
EXPECT_CALL(*this, BufferDecrypted(AesDecryptor::kSuccess, NotNull()))
.WillOnce(SaveArg<1>(&decrypted));
- decryptor_.Decrypt(encrypted, decrypt_cb_);
+ decryptor_.Decrypt(Decryptor::kVideo, encrypted, decrypt_cb_);
ASSERT_TRUE(decrypted);
ASSERT_EQ(plain_text_size, decrypted->GetDataSize());
EXPECT_NE(0, memcmp(plain_text, decrypted->GetData(), plain_text_size));
@@ -297,7 +297,7 @@ class AesDecryptorTest : public testing::Test {
EXPECT_CALL(*this, BufferDecrypted(AesDecryptor::kSuccess, NotNull()))
.WillOnce(SaveArg<1>(&decrypted));
- decryptor_.Decrypt(encrypted, decrypt_cb_);
+ decryptor_.Decrypt(Decryptor::kVideo, encrypted, decrypt_cb_);
ASSERT_TRUE(decrypted);
EXPECT_NE(plain_text_size, decrypted->GetDataSize());
EXPECT_NE(0, memcmp(plain_text, decrypted->GetData(), plain_text_size));
@@ -305,7 +305,7 @@ class AesDecryptorTest : public testing::Test {
void DecryptAndExpectToFail(const scoped_refptr<DecoderBuffer>& encrypted) {
EXPECT_CALL(*this, BufferDecrypted(AesDecryptor::kError, IsNull()));
- decryptor_.Decrypt(encrypted, decrypt_cb_);
+ decryptor_.Decrypt(Decryptor::kVideo, encrypted, decrypt_cb_);
}
MockDecryptorClient client_;
@@ -370,7 +370,7 @@ TEST_F(AesDecryptorTest, NoKey) {
CreateWebMEncryptedBuffer(frame.encrypted_data, frame.encrypted_data_size,
frame.key_id, frame.key_id_size);
EXPECT_CALL(*this, BufferDecrypted(AesDecryptor::kNoKey, IsNull()));
- decryptor_.Decrypt(encrypted_data, decrypt_cb_);
+ decryptor_.Decrypt(Decryptor::kVideo, encrypted_data, decrypt_cb_);
}
TEST_F(AesDecryptorTest, KeyReplacement) {
« no previous file with comments | « media/crypto/aes_decryptor.cc ('k') | media/filters/decrypting_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698