summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-18 04:17:09 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-18 04:17:09 +0000
commit046ba37097752ae25fdd0a520d6c4d77a2fb83e7 (patch)
tree2aa1c73af69b34a1c22502a2995db761e974defc /content
parenta6b556bb8326f9f99da927bf250d5e259be543ab (diff)
downloadchromium_src-046ba37097752ae25fdd0a520d6c4d77a2fb83e7.zip
chromium_src-046ba37097752ae25fdd0a520d6c4d77a2fb83e7.tar.gz
chromium_src-046ba37097752ae25fdd0a520d6c4d77a2fb83e7.tar.bz2
Encrypted Media: Old video decrypt-only path clean-up.
- Remove decryptor from FFmpegVideoDecoder. - Remove all decryption functionality from ProxyDecryptor. TBR=jam@chromium.org BUG=141786 TEST=this removes an obsolete code path and should not affect any exitst test/functionality. Review URL: https://codereview.chromium.org/11587002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173640 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/content_tests.gypi1
1 files changed, 0 insertions, 1 deletions
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 63f9038..c46ae02 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -456,7 +456,6 @@
'../webkit/media/buffered_resource_loader_unittest.cc',
'../webkit/media/cache_util_unittest.cc',
'../webkit/media/crypto/key_systems_unittest.cc',
- '../webkit/media/crypto/proxy_decryptor_unittest.cc',
'../webkit/media/test_response_generator.cc',
'../webkit/media/test_response_generator.h',
'../webkit/mocks/mock_weburlloader.cc',