LayoutTests/media/encrypted-media/encrypted-media-onencrypted.html - Issue 600143005: Rename onneedkey event to onencrypted.

Unified Diff: LayoutTests/media/encrypted-media/encrypted-media-onencrypted.html

Issue 600143005: Rename onneedkey event to onencrypted. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Remove OVERRIDE. Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« LayoutTests/media/encrypted-media/encrypted-media-lifetime-reload.html ('K') | « LayoutTests/media/encrypted-media/encrypted-media-needkey-expected.txt ('k') | LayoutTests/media/encrypted-media/encrypted-media-onencrypted-expected.txt » ('j') | LayoutTests/media/encrypted-media/encrypted-media-playback-multiple-sessions.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: LayoutTests/media/encrypted-media/encrypted-media-onencrypted.html

diff --git a/LayoutTests/media/encrypted-media/encrypted-media-needkey.html b/LayoutTests/media/encrypted-media/encrypted-media-onencrypted.html

similarity index 60%

rename from LayoutTests/media/encrypted-media/encrypted-media-needkey.html

rename to LayoutTests/media/encrypted-media/encrypted-media-onencrypted.html

index 857b0685b9184edbe671be087f6652ce1c4b9a3e..67577ffa976fd79179dea20da1cf39dd401a3083 100644

--- a/LayoutTests/media/encrypted-media/encrypted-media-needkey.html

+++ b/LayoutTests/media/encrypted-media/encrypted-media-onencrypted.html

@@ -1,7 +1,7 @@

<!DOCTYPE html>

<html>

<head>

- <title>NeedKey</title>

+ <title>onencrypted</title>

@@ -9,7 +9,7 @@

<body>

- <p>Test that needkey event is fired on an encrypted media file.</p>

+ <p>Test that encrypted event is fired on an encrypted media file.</p>

var expectedInitData = stringToUint8Array('0123456789012345');

wolenetz 2014/10/02 00:15:20 nit: test-encrypted.webm's expected metadata is us

sandersd (OOO until July 31) 2014/10/02 17:48:16 Ideally we wouldn't need the values in multiple te

@@ -20,21 +20,21 @@

{

var video = document.getElementById('testVideo');

- var onNeedKey = function(event)

+ var onEncrypted = function(event)

{

assert_equals(event.target, video);

- assert_true(event instanceof window.MediaKeyNeededEvent);

- assert_equals(event.type, 'needkey');

- assert_equals(event.contentType, 'video/webm');

- assert_array_equals(event.initData, expectedInitData);

+ assert_true(event instanceof window.MediaEncryptedEvent);

+ assert_equals(event.type, 'encrypted');

+ assert_equals(event.initDataType, 'webm');

wolenetz 2014/10/02 00:15:20 eme noob question: why not also check contentType?

sandersd (OOO until July 31) 2014/10/02 17:48:16 contentType is gone, initDataType replaced it.

+ assert_array_equals(new Uint8Array(event.initData), expectedInitData);

wolenetz 2014/10/02 00:15:20 eme noob question: why now wrapping in a Uint8Arra

sandersd (OOO until July 31) 2014/10/02 17:48:16 The return type is ArrayBuffer, which is not index

if (--expectedEvents == 0)

wolenetz 2014/10/02 00:15:20 nit: this affirms only that at least 2 events were

sandersd (OOO until July 31) 2014/10/02 17:48:16 You are correct, but there is not a lot we can do

test.done();

};

- waitForEventAndRunStep('needkey', video, onNeedKey, test);

+ waitForEventAndRunStep('encrypted', video, onEncrypted, test);

video.src = '../content/test-encrypted.webm';

- }, 'Needkey fired on encrypted media file.');

+ }, 'encrypted fired on encrypted media file.');

</script>

</body>

</html>