LayoutTests/media/encrypted-media/encrypted-media-setmediakeys.html - Issue 665213002: Implement navigator.requestMediaKeySystemAccess()

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: updates Created 6 years, 2 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 unified diff | Download patch

« LayoutTests/media/encrypted-media/encrypted-media-lifetime-multiple-mediakeys.html ('K') | « LayoutTests/media/encrypted-media/encrypted-media-session-closed-event.html ('k') | LayoutTests/media/encrypted-media/encrypted-media-unprefixed-after-prefixed.html » ('j') | LayoutTests/media/encrypted-media/encrypted-media-unprefixed-after-prefixed.html » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 Loading...
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');
	ddorwin 2014/10/24 23:08:14 nit: Since we're not really testing request() here nit: Since we're not really testing request() here, we probably don't need these. WDYT? Also, line 59
	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');

43 return video.setMediaKeys(mediaKeys);	45 return video.setMediaKeys(mediaKeys);

44 }).then(function(result) {	46 }).then(function(result) {

45 assert_not_equals(video.mediaKeys, null);	47 assert_not_equals(video.mediaKeys, null);

46 assert_true(video.mediaKeys === mediaKeys);	48 assert_true(video.mediaKeys === mediaKeys);

47	49

48 // Set it a second time.	50 // Set it a second time.

49 return video.setMediaKeys(mediaKeys);	51 return video.setMediaKeys(mediaKeys);

50 }).then(function(result) {	52 }).then(function(result) {

51 assert_not_equals(video.mediaKeys, null);	53 assert_not_equals(video.mediaKeys, null);

52 assert_true(video.mediaKeys === mediaKeys);	54 assert_true(video.mediaKeys === mediaKeys);

53	55

54 // Create a second MediaKeys.	56 // Create a second MediaKeys.

55 return MediaKeys.create('org.w3.clearkey');	57 return navigator.requestMediaKeySystemAccess('org.w3.clearke y');

	58 }).then(function(access) {

	59 assert_equals(access.keySystem, 'org.w3.clearkey');

	60 return access.createMediaKeys();

56 }).then(function(result) {	61 }).then(function(result) {

57 mediaKeys2 = result;	62 mediaKeys2 = result;

58 assert_not_equals(mediaKeys, null);	63 assert_not_equals(mediaKeys, null);

59 assert_not_equals(mediaKeys2, null);	64 assert_not_equals(mediaKeys2, null);

60 assert_not_equals(mediaKeys, mediaKeys2);	65 assert_not_equals(mediaKeys, mediaKeys2);

61 assert_equals(mediaKeys.keySystem, 'org.w3.clearkey');

62 assert_equals(mediaKeys2.keySystem, 'org.w3.clearkey');

63	66

64 // Assign the second MediaKeys to video.	67 // Assign the second MediaKeys to video.

65 return video.setMediaKeys(mediaKeys2);	68 return video.setMediaKeys(mediaKeys2);

66 }).then(function(result) {	69 }).then(function(result) {

67 assert_not_equals(video.mediaKeys, null);	70 assert_not_equals(video.mediaKeys, null);

68 assert_not_equals(video.mediaKeys, mediaKeys);	71 assert_not_equals(video.mediaKeys, mediaKeys);

69 assert_true(video.mediaKeys === mediaKeys2);	72 assert_true(video.mediaKeys === mediaKeys2);

70	73

71 // Set it back to first MediaKeys.	74 // Set it back to first MediaKeys.

72 return video.setMediaKeys(mediaKeys);	75 return video.setMediaKeys(mediaKeys);

(...skipping 24 matching lines...) Expand all Loading...
97 assert_true(video.mediaKeys === mediaKeys);	100 assert_true(video.mediaKeys === mediaKeys);

98 assert_not_equals(video.mediaKeys, mediaKeys2);	101 assert_not_equals(video.mediaKeys, mediaKeys2);

99 test.done();	102 test.done();

100 }).catch(function(error) {	103 }).catch(function(error) {

101 forceTestFailureFromPromise(test, error);	104 forceTestFailureFromPromise(test, error);

102 });	105 });

103 }, 'Setting MediaKeys on a video object.');	106 }, 'Setting MediaKeys on a video object.');

104 </script>	107 </script>

105 </body>	108 </body>

106 </html>	109 </html>

OLD	NEW