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

Unified Diff: third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-playback-two-videos.html

Issue 2084053002: EME: Update tests so 'audioCapabilities' always provided (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: changes (+rebase) Created 4 years, 5 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: third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-playback-two-videos.html
diff --git a/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-playback-two-videos.html b/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-playback-two-videos.html
index 30bb5825d47d5c13bde57c769caeedb1ec591454..027a2072a458ae288ac78429ee5c9d73bc14b1ed 100644
--- a/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-playback-two-videos.html
+++ b/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-playback-two-videos.html
@@ -17,19 +17,20 @@
var keyId = stringToUint8Array('0123456789012345');
var rawKey = new Uint8Array([0xeb, 0xdd, 0x62, 0xf1, 0x68, 0x14, 0xd2, 0x7b,
0x68, 0xef, 0x12, 0x2a, 0xfc, 0xe4, 0xae, 0x3c]);
+ var content = '../content/test-encrypted.webm';
promise_test(function(test)
{
var promises = [
- play_video_as_promise(document.getElementById('testVideo'), '../content/test-encrypted.webm'),
- play_video_as_promise(document.getElementById('secondVideo'), '../content/test-encrypted.webm')
+ play_video_as_promise(document.getElementById('testVideo'), content),
+ play_video_as_promise(document.getElementById('secondVideo'), content)
];
return Promise.all(promises);
}, 'Play two videos at the same time.');
function play_video_as_promise(video, content)
{
- return navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]).then(function(access) {
+ return navigator.requestMediaKeySystemAccess('org.w3.clearkey', getConfigurationForFile(content)).then(function(access) {
return access.createMediaKeys();
}).then(function(mediaKeys) {
return video.setMediaKeys(mediaKeys);

Powered by Google App Engine
This is Rietveld 408576698