Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(247)

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

Issue 655603003: Reland: Remove "needkey" event and add its replacement, "encrypted". (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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
Index: LayoutTests/media/encrypted-media/encrypted-media-needkey.html
diff --git a/LayoutTests/media/encrypted-media/encrypted-media-needkey.html b/LayoutTests/media/encrypted-media/encrypted-media-needkey.html
deleted file mode 100644
index f4e14554a0a1c9370320a9ee12ef97a751c24987..0000000000000000000000000000000000000000
--- a/LayoutTests/media/encrypted-media/encrypted-media-needkey.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <title>NeedKey</title>
- <script src="encrypted-media-utils.js"></script>
- <script src="../../resources/testharness.js"></script>
- <script src="../../resources/testharnessreport.js"></script>
- </head>
- <body>
- <video id="testVideo" controls></video>
- <div id="log"></div>
- <p>Test that needkey event is fired on an encrypted media file.</p>
- <script>
- var expectedInitData = stringToUint8Array('0123456789012345');
-
- // Will get 2 identical events, one for audio, one for video.
- var expectedEvents = 2;
-
- async_test(function(test)
- {
- var video = document.getElementById('testVideo');
-
- var onNeedKey = function(event)
- {
- assert_equals(event.target, video);
- assert_true(event instanceof window.MediaKeyNeededEvent);
- assert_equals(event.type, 'needkey');
- assert_array_equals(event.initData, expectedInitData);
-
- if (--expectedEvents == 0)
- test.done();
- };
-
- waitForEventAndRunStep('needkey', video, onNeedKey, test);
- video.src = '../content/test-encrypted.webm';
- }, 'Needkey fired on encrypted media file.');
- </script>
- </body>
-</html>

Powered by Google App Engine
This is Rietveld 408576698