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

Side by Side Diff: LayoutTests/media/encrypted-media/encrypted-media-setmediakeys.html

Issue 665213002: Implement navigator.requestMediaKeySystemAccess() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: add comment Created 6 years, 1 month 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 unified diff | Download patch
OLDNEW
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <html> 2 <html>
3 <head> 3 <head>
4 <title>MediaKeys</title> 4 <title>MediaKeys</title>
5 <script src="encrypted-media-utils.js"></script> 5 <script src="encrypted-media-utils.js"></script>
6 <script src="../../resources/testharness.js"></script> 6 <script src="../../resources/testharness.js"></script>
7 <script src="../../resources/testharnessreport.js"></script> 7 <script src="../../resources/testharnessreport.js"></script>
8 </head> 8 </head>
9 <body> 9 <body>
10 <video id="testVideo"></video> 10 <video id="testVideo"></video>
(...skipping 17 matching lines...) Expand all
28 28
29 // Try setting mediaKeys to the wrong type of object. 29 // Try setting mediaKeys to the wrong type of object.
30 return video.setMediaKeys(new Date()); 30 return video.setMediaKeys(new Date());
31 }).then(function(result) { 31 }).then(function(result) {
32 assert_unreached('setMediaKeys did not fail when setting to Date()'); 32 assert_unreached('setMediaKeys did not fail when setting to Date()');
33 }, function(error) { 33 }, function(error) {
34 // TypeError expected. 34 // TypeError expected.
35 assert_equals(error.name, 'TypeError'); 35 assert_equals(error.name, 'TypeError');
36 36
37 // Create a MediaKeys object and assign it to video. 37 // Create a MediaKeys object and assign it to video.
38 return MediaKeys.create('org.w3.clearkey'); 38 return navigator.requestMediaKeySystemAccess('org.w3.clearke y');
39 }).then(function(access) {
40 assert_equals(access.keySystem, 'org.w3.clearkey');
41 return access.createMediaKeys();
39 }).then(function(result) { 42 }).then(function(result) {
40 mediaKeys = result; 43 mediaKeys = result;
41 assert_not_equals(mediaKeys, null); 44 assert_not_equals(mediaKeys, null);
42 assert_equals(mediaKeys.keySystem, 'org.w3.clearkey'); 45 assert_equals(typeof mediaKeys.createSession, 'function');
43 return video.setMediaKeys(mediaKeys); 46 return video.setMediaKeys(mediaKeys);
44 }).then(function(result) { 47 }).then(function(result) {
45 assert_not_equals(video.mediaKeys, null); 48 assert_not_equals(video.mediaKeys, null);
46 assert_true(video.mediaKeys === mediaKeys); 49 assert_true(video.mediaKeys === mediaKeys);
47 50
48 // Set it a second time. 51 // Set it a second time.
49 return video.setMediaKeys(mediaKeys); 52 return video.setMediaKeys(mediaKeys);
50 }).then(function(result) { 53 }).then(function(result) {
51 assert_not_equals(video.mediaKeys, null); 54 assert_not_equals(video.mediaKeys, null);
52 assert_true(video.mediaKeys === mediaKeys); 55 assert_true(video.mediaKeys === mediaKeys);
53 56
54 // Create a second MediaKeys. 57 // Create a second MediaKeys.
55 return MediaKeys.create('org.w3.clearkey'); 58 return navigator.requestMediaKeySystemAccess('org.w3.clearke y');
59 }).then(function(access) {
60 assert_equals(access.keySystem, 'org.w3.clearkey');
61 return access.createMediaKeys();
56 }).then(function(result) { 62 }).then(function(result) {
57 mediaKeys2 = result; 63 mediaKeys2 = result;
58 assert_not_equals(mediaKeys, null); 64 assert_not_equals(mediaKeys, null);
59 assert_not_equals(mediaKeys2, null); 65 assert_not_equals(mediaKeys2, null);
60 assert_not_equals(mediaKeys, mediaKeys2); 66 assert_not_equals(mediaKeys, mediaKeys2);
61 assert_equals(mediaKeys.keySystem, 'org.w3.clearkey'); 67 assert_equals(typeof mediaKeys.createSession, 'function');
62 assert_equals(mediaKeys2.keySystem, 'org.w3.clearkey'); 68 assert_equals(typeof mediaKeys2.createSession, 'function');
63 69
64 // Assign the second MediaKeys to video. 70 // Assign the second MediaKeys to video.
65 return video.setMediaKeys(mediaKeys2); 71 return video.setMediaKeys(mediaKeys2);
66 }).then(function(result) { 72 }).then(function(result) {
67 assert_not_equals(video.mediaKeys, null); 73 assert_not_equals(video.mediaKeys, null);
68 assert_not_equals(video.mediaKeys, mediaKeys); 74 assert_not_equals(video.mediaKeys, mediaKeys);
69 assert_true(video.mediaKeys === mediaKeys2); 75 assert_true(video.mediaKeys === mediaKeys2);
70 76
71 // Set it back to first MediaKeys. 77 // Set it back to first MediaKeys.
72 return video.setMediaKeys(mediaKeys); 78 return video.setMediaKeys(mediaKeys);
(...skipping 24 matching lines...) Expand all
97 assert_true(video.mediaKeys === mediaKeys); 103 assert_true(video.mediaKeys === mediaKeys);
98 assert_not_equals(video.mediaKeys, mediaKeys2); 104 assert_not_equals(video.mediaKeys, mediaKeys2);
99 test.done(); 105 test.done();
100 }).catch(function(error) { 106 }).catch(function(error) {
101 forceTestFailureFromPromise(test, error); 107 forceTestFailureFromPromise(test, error);
102 }); 108 });
103 }, 'Setting MediaKeys on a video object.'); 109 }, 'Setting MediaKeys on a video object.');
104 </script> 110 </script>
105 </body> 111 </body>
106 </html> 112 </html>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698