Chromium Code Reviews| Index: LayoutTests/media/encrypted-media/encrypted-media-setmediakeys.html |
| diff --git a/LayoutTests/media/encrypted-media/encrypted-media-setmediakeys.html b/LayoutTests/media/encrypted-media/encrypted-media-setmediakeys.html |
| index 670556b9a8008117ed6ca07bec248ba9bf5d301c..8f87e6a94e3d61931250b668cb9e3d8b8befaae4 100644 |
| --- a/LayoutTests/media/encrypted-media/encrypted-media-setmediakeys.html |
| +++ b/LayoutTests/media/encrypted-media/encrypted-media-setmediakeys.html |
| @@ -35,11 +35,13 @@ |
| assert_equals(error.name, 'TypeError'); |
| // Create a MediaKeys object and assign it to video. |
| - return MediaKeys.create('org.w3.clearkey'); |
| + return navigator.requestMediaKeySystemAccess('org.w3.clearkey'); |
| + }).then(function(access) { |
| + assert_equals(access.keySystem, 'org.w3.clearkey'); |
|
ddorwin
2014/10/24 23:08:14
nit: Since we're not really testing request() here
|
| + return access.createMediaKeys(); |
| }).then(function(result) { |
| mediaKeys = result; |
| assert_not_equals(mediaKeys, null); |
| - assert_equals(mediaKeys.keySystem, 'org.w3.clearkey'); |
| return video.setMediaKeys(mediaKeys); |
| }).then(function(result) { |
| assert_not_equals(video.mediaKeys, null); |
| @@ -52,14 +54,15 @@ |
| assert_true(video.mediaKeys === mediaKeys); |
| // Create a second MediaKeys. |
| - return MediaKeys.create('org.w3.clearkey'); |
| + return navigator.requestMediaKeySystemAccess('org.w3.clearkey'); |
| + }).then(function(access) { |
| + assert_equals(access.keySystem, 'org.w3.clearkey'); |
| + return access.createMediaKeys(); |
| }).then(function(result) { |
| mediaKeys2 = result; |
| assert_not_equals(mediaKeys, null); |
| assert_not_equals(mediaKeys2, null); |
| assert_not_equals(mediaKeys, mediaKeys2); |
| - assert_equals(mediaKeys.keySystem, 'org.w3.clearkey'); |
| - assert_equals(mediaKeys2.keySystem, 'org.w3.clearkey'); |
| // Assign the second MediaKeys to video. |
| return video.setMediaKeys(mediaKeys2); |