6e0c878032f44a770d604b3d60e9f96b14cf27d7 - chromium/src

commit	6e0c878032f44a770d604b3d60e9f96b14cf27d7	[log] [tgz]
author	ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	Tue Dec 18 07:08:32 2012
committer	ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	Tue Dec 18 07:08:32 2012
tree	145a5ebc8a677aa90c3bad1d707912e758e073b8
parent	f88628791d00eaf5ae34aff349bf32e39f7a462e [diff]

Replace Chromium's content_decryption_module.h with the independent DEPS'd instance.

This allows third-party CDMs to be built before rolling potentially breaking changes into Chrome.

TEST=build succeeds and existing External CDM tests.

Review URL: https://codereview.chromium.org/11568045

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

.gitignore[diff]
DEPS[diff]
webkit/media/crypto/ppapi/cdm_export.h[Deleted - diff]
webkit/media/crypto/ppapi/cdm_video_decoder.cc[diff]
webkit/media/crypto/ppapi/cdm_video_decoder.h[diff]
webkit/media/crypto/ppapi/cdm_wrapper.cc[diff]
webkit/media/crypto/ppapi/clear_key_cdm.h[diff]
webkit/media/crypto/ppapi/content_decryption_module.h[Deleted - diff]
webkit/media/crypto/ppapi/fake_cdm_video_decoder.cc[diff]
webkit/media/crypto/ppapi/fake_cdm_video_decoder.h[diff]
webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.cc[diff]
webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.h[diff]
webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.cc[diff]
webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h[diff]
webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc[diff]
webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.h[diff]
webkit/media/webkit_media.gypi[diff]

17 files changed