summaryrefslogtreecommitdiffstats
path: root/content/content_tests.gypi
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-03 22:39:29 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-03 22:39:29 +0000
commitcf3b4f7d6b8b369ed973b160294f9ca29e58698c (patch)
tree7b89ec692b17de3760342022db2cddef29b084c3 /content/content_tests.gypi
parenta3fff4cdedbfde076b28897a65926490db95ff82 (diff)
downloadchromium_src-cf3b4f7d6b8b369ed973b160294f9ca29e58698c.zip
chromium_src-cf3b4f7d6b8b369ed973b160294f9ca29e58698c.tar.gz
chromium_src-cf3b4f7d6b8b369ed973b160294f9ca29e58698c.tar.bz2
Implement "Key Presence" step in "Encrypted Block Encounted" algorithm in EME.
See related spec here: http://dvcs.w3.org/hg/html-media/raw-file/tip/encrypted-media/encrypted-media.html#algorithms-enrypted-block If the AesDecryptor cannot find the decryption for the encrypted buffer, it returns a kNoKey. In ProxyDecryptor, if the input cannot be decrypted due to kNoKey, the ProxyDecryptor will cache the encrypted buffers and callbacks and fire a needkey event. When some key is added (AddKey called) later, it will try to decrypt these buffers again. The callbacks will be fired on the same thread where Decrypt() was called originally. BUG=125401, 125753 TEST=media_unittest, media layout_tests Review URL: https://chromiumcodereview.appspot.com/10822026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149952 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_tests.gypi')
-rw-r--r--content/content_tests.gypi1
1 files changed, 1 insertions, 0 deletions
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 0c490ac..50bb7db 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -412,6 +412,7 @@
'../webkit/media/buffered_data_source_unittest.cc',
'../webkit/media/buffered_resource_loader_unittest.cc',
'../webkit/media/cache_util_unittest.cc',
+ '../webkit/media/crypto/proxy_decryptor_unittest.cc',
'../webkit/media/skcanvas_video_renderer_unittest.cc',
'../webkit/media/test_response_generator.cc',
'../webkit/media/test_response_generator.h',