Remove support for non-JSON keys in AesDecryptor

Remove support for non-JSON keys in AesDecryptor

Since ProxyDecryptor() now converts EME v0.1b keys to JSON before passing
it to the AesDecryptor, remove the code that handles v0.1b keys in the
AesDecryptor.

BUG=224786
TEST=media_unittests pass, as do EME browser and content tests

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

[jrummell, 2013-11-21 22:04:46]

PTAL.

[ddorwin, 2013-11-22 04:38:26]

LGTM % 2 comments (including possible layout test failure).

https://codereview.chromium.org/77413005/diff/1/media/cdm/aes_decryptor.cc
File media/cdm/aes_decryptor.cc (left):

https://codereview.chromium.org/77413005/diff/1/media/cdm/aes_decryptor.cc#ol...
media/cdm/aes_decryptor.cc:336:
static_cast<size_t>(DecryptConfig::kDecryptionKeySize)) {
Are we checking the key size anywhere? I think the layout tests use this to test
the keyerror event..

https://codereview.chromium.org/77413005/diff/1/media/cdm/aes_decryptor.cc
File media/cdm/aes_decryptor.cc (right):

https://codereview.chromium.org/77413005/diff/1/media/cdm/aes_decryptor.cc#ne...
media/cdm/aes_decryptor.cc:304: // Since |key| represents valid JSON, init_data
must be empty.
You can probably remove this comment now.

[xhwang, 2013-11-22 07:52:57]

In CL description: s/Clear Key CDM/AesDecryptor/

lgtm % ddorwin's comments

[jrummell, 2013-11-22 18:53:10]

Updated. Added pipeline_integration_tests, as the test was failing by not
passing a JSON key (was going to do it as a sepertae CL, but looks like it is
required as part of this).

https://codereview.chromium.org/77413005/diff/1/media/cdm/aes_decryptor.cc
File media/cdm/aes_decryptor.cc (left):

https://codereview.chromium.org/77413005/diff/1/media/cdm/aes_decryptor.cc#ol...
media/cdm/aes_decryptor.cc:336:
static_cast<size_t>(DecryptConfig::kDecryptionKeySize)) {
On 2013/11/22 04:38:26, ddorwin wrote:
> Are we checking the key size anywhere? I think the layout tests use this to
test
> the keyerror event..

There is (AesDecryptorTest.WrongSizedKey). Interesting that it didn't fail.
Added test back.

https://codereview.chromium.org/77413005/diff/1/media/cdm/aes_decryptor.cc
File media/cdm/aes_decryptor.cc (right):

https://codereview.chromium.org/77413005/diff/1/media/cdm/aes_decryptor.cc#ne...
media/cdm/aes_decryptor.cc:304: // Since |key| represents valid JSON, init_data
must be empty.
On 2013/11/22 04:38:26, ddorwin wrote:
> You can probably remove this comment now.

Done.

[xhwang, 2013-11-22 18:56:00]

lgtm++

[commit-bot: I haz the power, 2013-11-22 19:41:17]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jrummell@chromium.org/77413005/80001

[ddorwin, 2013-11-22 20:17:11]

https://codereview.chromium.org/77413005/diff/1/media/cdm/aes_decryptor.cc
File media/cdm/aes_decryptor.cc (left):

https://codereview.chromium.org/77413005/diff/1/media/cdm/aes_decryptor.cc#ol...
media/cdm/aes_decryptor.cc:336:
static_cast<size_t>(DecryptConfig::kDecryptionKeySize)) {
On 2013/11/22 18:53:11, jrummell wrote:
> On 2013/11/22 04:38:26, ddorwin wrote:
> > Are we checking the key size anywhere? I think the layout tests use this to
> test
> > the keyerror event..
> 
> There is (AesDecryptorTest.WrongSizedKey). Interesting that it didn't fail.
> Added test back.

Maybe we check the kid size too somewhere? We should find out why this was
passing. We might need separate wrong size kid and key JWKs.

[commit-bot: I haz the power, 2013-11-22 23:05:37]

Change committed as 236858