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

Unified Diff: LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeys-with-session.html

Issue 1004843003: Use requestMediaKeySystemAccess() to check type support in EME layout tests (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Move vars Created 5 years, 9 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-lifetime-mediakeys-with-session.html
diff --git a/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeys-with-session.html b/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeys-with-session.html
index 10089d5fe53469ab96e420ee76cbacb74154c3a2..1fd8d2eee4b770e7a74e8e5b33030bc04d581fcb 100644
--- a/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeys-with-session.html
+++ b/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeys-with-session.html
@@ -26,6 +26,8 @@
// ActiveDOMObject) and verify lifetime.
async_test(function(test)
{
+ var initDataType;
+ var initData;
var mediaKeys;
var startingActiveDOMObjectCount = window.internals.activeDOMObjectCount(document);
@@ -35,7 +37,11 @@
}
// Create a MediaKeys object with a session.
- navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]).then(function(access) {
+ getSupportedInitDataType().then(function(type) {
+ initDataType = type;
+ initData = getInitData(initDataType);
+ return navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]);
+ }).then(function(access) {
assert_equals(access.keySystem, 'org.w3.clearkey');
return access.createMediaKeys();
}).then(function(result) {
@@ -48,9 +54,8 @@
// 1 MediaKeySystemAccessInitializer).
assert_less_than_equal(numActiveDOMObjectsCreated(), 2, 'MediaKeys.create()');
- var initDataType = getInitDataType();
var mediaKeySession = mediaKeys.createSession();
- return mediaKeySession.generateRequest(initDataType, getInitData(initDataType));
+ return mediaKeySession.generateRequest(initDataType, initData);
}).then(function() {
// 1 MediaKeySession.
// In non-Oilpan, numActiveDOMObjectsCreate() == 1.

Powered by Google App Engine
This is Rietveld 408576698