| Index: media/crypto/aes_decryptor_unittest.cc
|
| diff --git a/media/crypto/aes_decryptor_unittest.cc b/media/crypto/aes_decryptor_unittest.cc
|
| index 34354a4a657a7740aae40b5ee1820351a9189510..408de0485fdb986b8b4ca3246eaacb2524424bc6 100644
|
| --- a/media/crypto/aes_decryptor_unittest.cc
|
| +++ b/media/crypto/aes_decryptor_unittest.cc
|
| @@ -240,7 +240,6 @@ class AesDecryptorTest : public testing::Test {
|
| }
|
|
|
| void DecryptAndExpectToFail(const uint8* data, int data_size,
|
| - const uint8* plain_text, int plain_text_size,
|
| const uint8* key_id, int key_id_size) {
|
| scoped_refptr<DecoderBuffer> encrypted_data =
|
| CreateWebMEncryptedBuffer(data, data_size, key_id, key_id_size);
|
| @@ -275,12 +274,21 @@ TEST_F(AesDecryptorTest, WrongKey) {
|
| kWebmWrongKey, arraysize(kWebmWrongKey));
|
| ASSERT_NO_FATAL_FAILURE(DecryptAndExpectToFail(frame.encrypted_data,
|
| frame.encrypted_data_size,
|
| - frame.plain_text,
|
| - frame.plain_text_size,
|
| frame.key_id,
|
| frame.key_id_size));
|
| }
|
|
|
| +TEST_F(AesDecryptorTest, NoKey) {
|
| + const WebmEncryptedData& frame = kWebmEncryptedFrames[0];
|
| + GenerateKeyRequest(frame.key_id, frame.key_id_size);
|
| +
|
| + scoped_refptr<DecoderBuffer> encrypted_data =
|
| + 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_);
|
| +}
|
| +
|
| TEST_F(AesDecryptorTest, KeyReplacement) {
|
| const WebmEncryptedData& frame = kWebmEncryptedFrames[0];
|
| GenerateKeyRequest(frame.key_id, frame.key_id_size);
|
| @@ -288,8 +296,6 @@ TEST_F(AesDecryptorTest, KeyReplacement) {
|
| kWebmWrongKey, arraysize(kWebmWrongKey));
|
| ASSERT_NO_FATAL_FAILURE(DecryptAndExpectToFail(frame.encrypted_data,
|
| frame.encrypted_data_size,
|
| - frame.plain_text,
|
| - frame.plain_text_size,
|
| frame.key_id,
|
| frame.key_id_size));
|
| AddKeyAndExpectToSucceed(frame.key_id, frame.key_id_size,
|
| @@ -349,8 +355,6 @@ TEST_F(AesDecryptorTest, HmacCheckFailure) {
|
| frame.key, frame.key_size);
|
| ASSERT_NO_FATAL_FAILURE(DecryptAndExpectToFail(kWebmFrame0HmacDataChanged,
|
| frame.encrypted_data_size,
|
| - frame.plain_text,
|
| - frame.plain_text_size,
|
| frame.key_id,
|
| frame.key_id_size));
|
| }
|
| @@ -362,8 +366,6 @@ TEST_F(AesDecryptorTest, IvCheckFailure) {
|
| frame.key, frame.key_size);
|
| ASSERT_NO_FATAL_FAILURE(DecryptAndExpectToFail(kWebmFrame0IvDataChanged,
|
| frame.encrypted_data_size,
|
| - frame.plain_text,
|
| - frame.plain_text_size,
|
| frame.key_id,
|
| frame.key_id_size));
|
| }
|
| @@ -375,8 +377,6 @@ TEST_F(AesDecryptorTest, DataCheckFailure) {
|
| frame.key, frame.key_size);
|
| ASSERT_NO_FATAL_FAILURE(DecryptAndExpectToFail(kWebmFrame0FrameDataChanged,
|
| frame.encrypted_data_size,
|
| - frame.plain_text,
|
| - frame.plain_text_size,
|
| frame.key_id,
|
| frame.key_id_size));
|
| }
|
|
|