LayoutTests/media/encrypted-media/encrypted-media-keystatuses-multiple-updates.html - Issue 1004843003: Use requestMediaKeySystemAccess() to check type support in EME layout tests

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: LayoutTests/media/encrypted-media/encrypted-media-keystatuses-multiple-updates.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: Changes 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

« no previous file with comments | « LayoutTests/media/encrypted-media/encrypted-media-keystatuses-multiple-sessions.html ('k') | LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeys-with-session.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: LayoutTests/media/encrypted-media/encrypted-media-keystatuses-multiple-updates.html

diff --git a/LayoutTests/media/encrypted-media/encrypted-media-keystatuses-multiple-updates.html b/LayoutTests/media/encrypted-media/encrypted-media-keystatuses-multiple-updates.html

index 45a25ab230e45a1525e05b20ff5ccd3ef6c6507d..b62b721c9bd39d5bcdaa576f7ab71b93e811932f 100644

--- a/LayoutTests/media/encrypted-media/encrypted-media-keystatuses-multiple-updates.html

+++ b/LayoutTests/media/encrypted-media/encrypted-media-keystatuses-multiple-updates.html

@@ -9,6 +9,8 @@

<body>

+ var initDataType;

sandersd (OOO until July 31) 2015/03/17 22:23:17 Now that I'm thinking about it, this should all be

jrummell 2015/03/17 23:49:12 Moved inside the test.

+ var initData;

var mediaKeySession;

var firstEvent;

@@ -58,10 +60,13 @@

}

- 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) {

return access.createMediaKeys();

}).then(function(mediaKeys) {

- var initDataType = getInitDataType();

mediaKeySession = mediaKeys.createSession();

// There should be no keys defined yet.

@@ -70,7 +75,7 @@

waitForEventAndRunStep('message', mediaKeySession, processMessage, test);

waitForEventAndRunStep('keystatuseschange', mediaKeySession, processKeyStatusesChange, test);

- return mediaKeySession.generateRequest(initDataType, getInitData(initDataType));

+ return mediaKeySession.generateRequest(initDataType, initData);

}).catch(function(error) {

forceTestFailureFromPromise(test, error);

});