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

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.

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=173664

[ddorwin, 2012-12-14 22:50:55]

PTAL.

I need to wait for the git mirror before I can land.
I will also need to set svnignore manually after getting an LGTM.

[xhwang, 2012-12-14 23:10:54]

One thing I feel bad is that cdm stills live under ppapi...

On a second thought (sorry for ), does it make sense to you to keep the cdm
interface under a cdm_interface folder (sorry for proposing this so late)? Then
we can have the following folder structure:

webkit/media/crypto/cdm/cdm_interface/cdm.h
webkit/media/crypto/cdm/ppapi/cdm_wrapper.*
webkit/media/crypto/cdm/clear_key_cdm/clear_key_cdm et al
webkit/media/crypto/cdm/tools/cdm_bench et al

It's up to you. If you don't like it, this CL is lgtm.

[ddorwin, 2012-12-14 23:19:47]

On 2012/12/14 23:10:54, xhwang wrote:
> One thing I feel bad is that cdm stills live under ppapi...
> 
> On a second thought (sorry for ), does it make sense to you to keep the cdm
> interface under a cdm_interface folder (sorry for proposing this so late)?
Then
> we can have the following folder structure:
> 
> webkit/media/crypto/cdm/cdm_interface/cdm.h
> webkit/media/crypto/cdm/ppapi/cdm_wrapper.*
> webkit/media/crypto/cdm/clear_key_cdm/clear_key_cdm et al
> webkit/media/crypto/cdm/tools/cdm_bench et al
> 
> It's up to you. If you don't like it, this CL is lgtm.

That makes sense, but I think we should refactor the directory structure
separately. For now, I've just put cdm.h in a directory from where it was. We
can evaluate the directory renaming in DEPS when we do that.

[xhwang, 2012-12-14 23:20:57]

On 2012/12/14 23:19:47, ddorwin wrote:
> On 2012/12/14 23:10:54, xhwang wrote:
> > One thing I feel bad is that cdm stills live under ppapi...
> > 
> > On a second thought (sorry for ), does it make sense to you to keep the cdm
> > interface under a cdm_interface folder (sorry for proposing this so late)?
> Then
> > we can have the following folder structure:
> > 
> > webkit/media/crypto/cdm/cdm_interface/cdm.h
> > webkit/media/crypto/cdm/ppapi/cdm_wrapper.*
> > webkit/media/crypto/cdm/clear_key_cdm/clear_key_cdm et al
> > webkit/media/crypto/cdm/tools/cdm_bench et al
> > 
> > It's up to you. If you don't like it, this CL is lgtm.
> 
> That makes sense, but I think we should refactor the directory structure
> separately. For now, I've just put cdm.h in a directory from where it was. We
> can evaluate the directory renaming in DEPS when we do that.

sg

[commit-bot: I haz the power, 2012-12-18 02:20:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ddorwin@chromium.org/11568045/14001