Add AES decryptor and tests.

For now we support decryption in video only. The first encryption key ID in ContentEncodings element will be used as the decryption key ID. Also we assume decryption key is the same as key ID.

BUG=117060
TEST=test page with encrypted content plays; added media_unittest

Review URL: http://codereview.chromium.org/9298021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125560 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 1 deletions

diff --git a/media/base/test_data_util.cc b/media/base/test_data_util.cc
index 15284da..bb08175 100644
--- a/media/base/test_data_util.cc
+++ b/media/base/test_data_util.cc
@@ -7,6 +7,8 @@
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
+#include "media/base/buffers.h"
+#include "media/base/data_buffer.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 
 namespace media {
@@ -51,11 +53,19 @@ void ReadTestDataFile(const std::string& name, scoped_array<uint8>* buffer,
   *size = file_size;
 }
 
-void ReadTestDataFile(const std::string& name, scoped_refptr<Buffer>* buffer) {
+void ReadTestDataFile(const std::string& name,
+                      scoped_refptr<DataBuffer>* buffer) {
   scoped_array<uint8> buf;
   int buf_size;
   ReadTestDataFile(name, &buf, &buf_size);
   *buffer = new DataBuffer(buf.Pass(), buf_size);
 }
 
+void ReadTestDataFile(const std::string& name,
+                      scoped_refptr<Buffer>* buffer) {
+  scoped_refptr<DataBuffer> data_buffer;
+  ReadTestDataFile(name, &data_buffer);
+  *buffer = data_buffer;
+}
+
 }  // namespace media