Add support for cdm::ContentDecryptionModule_8, remove CDM_6

Add support for cdm::ContentDecryptionModule_8, remove CDM_6

BUG=450861
TEST=existing EME layout tests pass

Committed: https://crrev.com/8f5011604952937c2b0e4e2e508d8c9669843612
Cr-Commit-Position: refs/heads/master@{#321617}

[jrummell, 2015-03-19 21:44:57]

jrummell@chromium.org changed reviewers:
+ ddorwin@chromium.org, sandersd@chromium.org, xhwang@chromium.org

[jrummell, 2015-03-19 21:44:58]

PTAL. I'll update the DEPS in a future PS.

[ddorwin, 2015-03-20 00:05:22]

LGTM % comments

https://codereview.chromium.org/1023003002/diff/1/media/cdm/ppapi/cdm_adapter.cc
File media/cdm/ppapi/cdm_adapter.cc (right):

https://codereview.chromium.org/1023003002/diff/1/media/cdm/ppapi/cdm_adapter...
media/cdm/ppapi/cdm_adapter.cc:245: return cdm::kWebM;
perhaps kKeyIds since it's not supported in existing CDMs, which use CDM_7.

https://codereview.chromium.org/1023003002/diff/1/media/cdm/ppapi/cdm_adapter...
media/cdm/ppapi/cdm_adapter.cc:360: PP_DCHECK(key_system_.empty() ||
(key_system_ == key_system && cdm_));
xhwang: Is this and line 381 because of prefixed? If so, we should add a TODO
for that bug.

https://codereview.chromium.org/1023003002/diff/1/media/cdm/ppapi/cdm_adapter...
media/cdm/ppapi/cdm_adapter.cc:421: // Chromium. http://crbug.com/417440
Not sure that's the right bug. We probably need a separate one since this is
going to involve Pepper changes.

[xhwang, 2015-03-20 00:53:23]

lgtm

https://codereview.chromium.org/1023003002/diff/1/media/cdm/ppapi/cdm_adapter.cc
File media/cdm/ppapi/cdm_adapter.cc (right):

https://codereview.chromium.org/1023003002/diff/1/media/cdm/ppapi/cdm_adapter...
media/cdm/ppapi/cdm_adapter.cc:360: PP_DCHECK(key_system_.empty() ||
(key_system_ == key_system && cdm_));
On 2015/03/20 00:05:22, ddorwin wrote:
> xhwang: Is this and line 381 because of prefixed? If so, we should add a TODO
> for that bug.

Hmm, actually I am not sure. It's added here:

https://chromiumcodereview.appspot.com/24192004

[ddorwin, 2015-03-20 01:10:14]

https://codereview.chromium.org/1023003002/diff/1/media/cdm/ppapi/cdm_adapter.cc
File media/cdm/ppapi/cdm_adapter.cc (right):

https://codereview.chromium.org/1023003002/diff/1/media/cdm/ppapi/cdm_adapter...
media/cdm/ppapi/cdm_adapter.cc:360: PP_DCHECK(key_system_.empty() ||
(key_system_ == key_system && cdm_));
On 2015/03/20 00:53:23, xhwang wrote:
> On 2015/03/20 00:05:22, ddorwin wrote:
> > xhwang: Is this and line 381 because of prefixed? If so, we should add a
TODO
> > for that bug.
> 
> Hmm, actually I am not sure. It's added here:
> 
> https://chromiumcodereview.appspot.com/24192004

As discussed offline, this will be addressed by 469003. John, please add a TODO
to remove these when fixing that.

[jrummell, 2015-03-20 18:05:09]

Thanks for the reviews.

https://codereview.chromium.org/1023003002/diff/1/media/cdm/ppapi/cdm_adapter.cc
File media/cdm/ppapi/cdm_adapter.cc (right):

https://codereview.chromium.org/1023003002/diff/1/media/cdm/ppapi/cdm_adapter...
media/cdm/ppapi/cdm_adapter.cc:245: return cdm::kWebM;
On 2015/03/20 00:05:22, ddorwin wrote:
> perhaps kKeyIds since it's not supported in existing CDMs, which use CDM_7.

Done.

https://codereview.chromium.org/1023003002/diff/1/media/cdm/ppapi/cdm_adapter...
media/cdm/ppapi/cdm_adapter.cc:360: PP_DCHECK(key_system_.empty() ||
(key_system_ == key_system && cdm_));
On 2015/03/20 01:10:14, ddorwin wrote:
> On 2015/03/20 00:53:23, xhwang wrote:
> > On 2015/03/20 00:05:22, ddorwin wrote:
> > > xhwang: Is this and line 381 because of prefixed? If so, we should add a
> TODO
> > > for that bug.
> > 
> > Hmm, actually I am not sure. It's added here:
> > 
> > https://chromiumcodereview.appspot.com/24192004
> 
> As discussed offline, this will be addressed by 469003. John, please add a
TODO
> to remove these when fixing that.

Done.

https://codereview.chromium.org/1023003002/diff/1/media/cdm/ppapi/cdm_adapter...
media/cdm/ppapi/cdm_adapter.cc:421: // Chromium. http://crbug.com/417440
On 2015/03/20 00:05:22, ddorwin wrote:
> Not sure that's the right bug. We probably need a separate one since this is
> going to involve Pepper changes.

417440 is the bug referenced in webmediaplayer_impl.cc and
webmediaplayer_android.cc to change |init_data_type|, so I just copied it here.

[ddorwin, 2015-03-20 18:26:29]

LGTM % comment in previous PS.

https://codereview.chromium.org/1023003002/diff/1/media/cdm/ppapi/cdm_adapter.cc
File media/cdm/ppapi/cdm_adapter.cc (right):

https://codereview.chromium.org/1023003002/diff/1/media/cdm/ppapi/cdm_adapter...
media/cdm/ppapi/cdm_adapter.cc:421: // Chromium. http://crbug.com/417440
On 2015/03/20 18:05:09, jrummell wrote:
> On 2015/03/20 00:05:22, ddorwin wrote:
> > Not sure that's the right bug. We probably need a separate one since this is
> > going to involve Pepper changes.
> 
> 417440 is the bug referenced in webmediaplayer_impl.cc and
> webmediaplayer_android.cc to change |init_data_type|, so I just copied it
here.

Okay, but please do file a separate bug for the Pepper work and use it here.

[jrummell, 2015-03-20 18:49:35]

Opened bug 469228 and referenced it.

https://codereview.chromium.org/1023003002/diff/1/media/cdm/ppapi/cdm_adapter.cc
File media/cdm/ppapi/cdm_adapter.cc (right):

https://codereview.chromium.org/1023003002/diff/1/media/cdm/ppapi/cdm_adapter...
media/cdm/ppapi/cdm_adapter.cc:421: // Chromium. http://crbug.com/417440
On 2015/03/20 18:26:29, ddorwin wrote:
> On 2015/03/20 18:05:09, jrummell wrote:
> > On 2015/03/20 00:05:22, ddorwin wrote:
> > > Not sure that's the right bug. We probably need a separate one since this
is
> > > going to involve Pepper changes.
> > 
> > 417440 is the bug referenced in webmediaplayer_impl.cc and
> > webmediaplayer_android.cc to change |init_data_type|, so I just copied it
> here.
> 
> Okay, but please do file a separate bug for the Pepper work and use it here.

Opened bug 469228.

[jrummell, 2015-03-20 19:04:48]

The CQ bit was checked by jrummell@chromium.org

[jrummell, 2015-03-20 19:04:48]

The patchset sent to the CQ was uploaded after l-g-t-m from xhwang@chromium.org,
ddorwin@chromium.org
Link to the patchset: https://codereview.chromium.org/1023003002/#ps40001
(title: "new bug #")

[commit-bot: I haz the power, 2015-03-20 19:05:16]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1023003002/40001

[commit-bot: I haz the power, 2015-03-20 20:02:33]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2015-03-20 20:03:15]

Patchset 3 (id:??) landed as
https://crrev.com/8f5011604952937c2b0e4e2e508d8c9669843612
Cr-Commit-Position: refs/heads/master@{#321617}