Allow JSON messages to be returned for ClearKey.

Allow JSON messages to be returned for ClearKey.

The EME specification now describes the format of the license
request provided to the application via the message attribute of
the message event as being JSON. This change allows the browser
tests to work once the new message format is implemented.

BUG=358271
TEST=EME layout tests pass with and without the JSON change

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=179880

[jrummell, 2014-07-29 23:21:11]

PTAL. Actual changes to return JSON are in
https://codereview.chromium.org/427993002/.

[ddorwin, 2014-08-08 20:41:14]

https://codereview.chromium.org/429033003/diff/1/LayoutTests/media/encrypted-...
File LayoutTests/media/encrypted-media/encrypted-media-lifetime-reload.html
(right):

https://codereview.chromium.org/429033003/diff/1/LayoutTests/media/encrypted-...
LayoutTests/media/encrypted-media/encrypted-media-lifetime-reload.html:50: var
keyId = extractFirstLicenseKey(event.message);
extractSingleKeyIdFromMessage()?
If there is more than one, we probably shouldn't be calling this function.

Maybe someday we'll have extractKeyIdsFromMessage() and pass the entire list to
createJWKSet.

https://codereview.chromium.org/429033003/diff/1/LayoutTests/media/encrypted-...
File LayoutTests/media/encrypted-media/encrypted-media-utils.js (right):

https://codereview.chromium.org/429033003/diff/1/LayoutTests/media/encrypted-...
LayoutTests/media/encrypted-media/encrypted-media-utils.js:127: function
extractFirstLicenseKey(message)
As mentioned earlier, should this be extractSingleKeyIdFromMessage() along with
an assert on kids.length?

https://codereview.chromium.org/429033003/diff/1/LayoutTests/media/encrypted-...
LayoutTests/media/encrypted-media/encrypted-media-utils.js:132: var decoded_key
= atob(json.kids[0]);
FIXME: Switch to base64url

See
https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-...

https://codereview.chromium.org/429033003/diff/1/LayoutTests/media/encrypted-...
LayoutTests/media/encrypted-media/encrypted-media-utils.js:136: catch (o) {
Just throw up the stack? It would mean the test is broken, so this would
probably be better.

Oh, this is for backwards compatibility and/or prefixed? If so, note that and
add a FIXME to remove it.

[jrummell, 2014-08-08 23:51:28]

Updated.

https://codereview.chromium.org/429033003/diff/1/LayoutTests/media/encrypted-...
File LayoutTests/media/encrypted-media/encrypted-media-lifetime-reload.html
(right):

https://codereview.chromium.org/429033003/diff/1/LayoutTests/media/encrypted-...
LayoutTests/media/encrypted-media/encrypted-media-lifetime-reload.html:50: var
keyId = extractFirstLicenseKey(event.message);
On 2014/08/08 20:41:14, ddorwin wrote:
> extractSingleKeyIdFromMessage()?
> If there is more than one, we probably shouldn't be calling this function.
> 
> Maybe someday we'll have extractKeyIdsFromMessage() and pass the entire list
to
> createJWKSet.

Done.

https://codereview.chromium.org/429033003/diff/1/LayoutTests/media/encrypted-...
File LayoutTests/media/encrypted-media/encrypted-media-utils.js (right):

https://codereview.chromium.org/429033003/diff/1/LayoutTests/media/encrypted-...
LayoutTests/media/encrypted-media/encrypted-media-utils.js:127: function
extractFirstLicenseKey(message)
On 2014/08/08 20:41:14, ddorwin wrote:
> As mentioned earlier, should this be extractSingleKeyIdFromMessage() along
with
> an assert on kids.length?

Done.

https://codereview.chromium.org/429033003/diff/1/LayoutTests/media/encrypted-...
LayoutTests/media/encrypted-media/encrypted-media-utils.js:132: var decoded_key
= atob(json.kids[0]);
On 2014/08/08 20:41:14, ddorwin wrote:
> FIXME: Switch to base64url
> 
> See
>
https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-...

Done.

https://codereview.chromium.org/429033003/diff/1/LayoutTests/media/encrypted-...
LayoutTests/media/encrypted-media/encrypted-media-utils.js:136: catch (o) {
On 2014/08/08 20:41:14, ddorwin wrote:
> Just throw up the stack? It would mean the test is broken, so this would
> probably be better.
> 
> Oh, this is for backwards compatibility and/or prefixed? If so, note that and
> add a FIXME to remove it.

Done.

[ddorwin, 2014-08-08 23:59:26]

lgtm

thanks.

[jrummell, 2014-08-09 00:14:46]

The CQ bit was checked by jrummell@chromium.org

[commit-bot: I haz the power, 2014-08-09 00:15:35]

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

[commit-bot: I haz the power, 2014-08-09 01:34:42]

Change committed as 179880