third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeys-with-session.html - Issue 2084053002: EME: Update tests so 'audioCapabilities' always provided

Side by Side Diff: third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeys-with-session.html

Issue 2084053002: EME: Update tests so 'audioCapabilities' always provided (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: auto detection of initDataType Created 4 years, 5 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

« third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-clearkey-update-non-ascii-input.html ('K') | « third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeys.html ('k') | third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-reference.html » ('j') | third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-reference.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>Test MediaKeys lifetime when adding a session</title>	4 <title>Test MediaKeys lifetime when adding a session</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 <div id="log"></div>	10 <div id="log"></div>

(...skipping 13 matching lines...) Expand all Loading...
24 var initData;	24 var initData;

25 var mediaKeys;	25 var mediaKeys;

26 var startingActiveDOMObjectCount = window.internals.activeDOMObj ectCount(document);	26 var startingActiveDOMObjectCount = window.internals.activeDOMObj ectCount(document);

27	27

28 function numActiveDOMObjectsCreated()	28 function numActiveDOMObjectsCreated()

29 {	29 {

30 return window.internals.activeDOMObjectCount(document) - sta rtingActiveDOMObjectCount;	30 return window.internals.activeDOMObjectCount(document) - sta rtingActiveDOMObjectCount;

31 }	31 }

32	32

33 // Create a MediaKeys object with a session.	33 // Create a MediaKeys object with a session.

34 getSupportedInitDataType().then(function(type) {	34 navigator.requestMediaKeySystemAccess('org.w3.clearkey', simpleC onfiguration()).then(function(access) {

35 initDataType = type;	35 assert_equals(access.keySystem, 'org.w3.clearkey');
	ddorwin 2016/07/20 17:05:27 This existing assert seems unnecessary. Presumably This existing assert seems unnecessary. Presumably we check the attribute elsewhere. jrummell 2016/07/20 19:07:48 Removed. Show quoted text On 2016/07/20 17:05:27, ddorwin wrote: > This existing assert seems unnecessary. Presumably we check the attribute > elsewhere. Removed.
	36 initDataType = access.getConfiguration().initDataTypes[0];

36 initData = getInitData(initDataType);	37 initData = getInitData(initDataType);

37 return navigator.requestMediaKeySystemAccess('org.w3.clearke y', [{}]);

38 }).then(function(access) {

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

40 return access.createMediaKeys();	38 return access.createMediaKeys();

41 }).then(function(result) {	39 }).then(function(result) {

42 mediaKeys = result;	40 mediaKeys = result;

43	41

44 // Verify MediaKeys is an ActiveDOMObject.	42 // Verify MediaKeys is an ActiveDOMObject.

45 // In non-Oilpan, numActiveDOMObjectsCreate() == 1.	43 // In non-Oilpan, numActiveDOMObjectsCreate() == 1.

46 // In Oilpan, numActiveDOMObjectsCreate() <= 4.	44 // In Oilpan, numActiveDOMObjectsCreate() <= 4.

47 // (1 MediaKeys,	45 // (1 MediaKeys,

48 // 1 MediaKeysInitializer and	46 // 1 MediaKeysInitializer and

49 // 1 MediaKeySystemAccessInitializer (navigator.requestMedi aKeySystemAccess() use above),	47 // 1 MediaKeySystemAccessInitializer (navigator.requestMedi aKeySystemAccess() use above),

(...skipping 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
94 assert_between_inclusive(numActiveDOMObjectsCreated(), 0, 1, 'After final gc()');	92 assert_between_inclusive(numActiveDOMObjectsCreated(), 0, 1, 'After final gc()');

95	93

96 test.done();	94 test.done();

97 }).catch(function(error) {	95 }).catch(function(error) {

98 forceTestFailureFromPromise(test, error);	96 forceTestFailureFromPromise(test, error);

99 });	97 });

100 }, 'MediaKeys lifetime with session');	98 }, 'MediaKeys lifetime with session');

101 </script>	99 </script>

102 </body>	100 </body>

103 </html>	101 </html>

OLD	NEW