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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-syntax.html

Issue 2707393002: Revert "EME: Fail requestMediaKeySystemAccess if no capabilities specified"
Patch Set: Created 3 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 unified diff | Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-requestmediakeysystemaccess.html ('k') | third_party/WebKit/Source/core/frame/UseCounter.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <html> 2 <html>
3 <head> 3 <head>
4 <title>Test EME syntax</title> 4 <title>Test EME syntax</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 <script> 10 <script>
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 Promise.all(createPromises).then(function(result) { 121 Promise.all(createPromises).then(function(result) {
122 test.done(); 122 test.done();
123 }).catch(function(error) { 123 }).catch(function(error) {
124 forceTestFailureFromPromise(test, error, 'requestMediaKeySys temAccess() tests failed'); 124 forceTestFailureFromPromise(test, error, 'requestMediaKeySys temAccess() tests failed');
125 }); 125 });
126 }, 'Test Navigator.requestMediaKeySystemAccess() exceptions.'); 126 }, 'Test Navigator.requestMediaKeySystemAccess() exceptions.');
127 127
128 async_test(function(test) 128 async_test(function(test)
129 { 129 {
130 assert_equals(typeof navigator.requestMediaKeySystemAccess, 'fun ction'); 130 assert_equals(typeof navigator.requestMediaKeySystemAccess, 'fun ction');
131 navigator.requestMediaKeySystemAccess('org.w3.clearkey', getSimp leConfiguration()).then(function(access) { 131 navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]).t hen(function(access) {
132 assert_not_equals(access, null); 132 assert_not_equals(access, null);
133 assert_equals(typeof access, 'object'); 133 assert_equals(typeof access, 'object');
134 assert_equals(access.keySystem, 'org.w3.clearkey'); 134 assert_equals(access.keySystem, 'org.w3.clearkey');
135 assert_equals(typeof access.getConfiguration, 'function'); 135 assert_equals(typeof access.getConfiguration, 'function');
136 assert_equals(typeof access.createMediaKeys, 'function'); 136 assert_equals(typeof access.createMediaKeys, 'function');
137 test.done(); 137 test.done();
138 }).catch(function(error) { 138 }).catch(function(error) {
139 forceTestFailureFromPromise(test, error, 'requestMediaKeySys temAccess() tests failed'); 139 forceTestFailureFromPromise(test, error, 'requestMediaKeySys temAccess() tests failed');
140 }); 140 });
141 }, 'Test Navigator.requestMediaKeySystemAccess().'); 141 }, 'Test Navigator.requestMediaKeySystemAccess().');
142 142
143 async_test(function(test) 143 async_test(function(test)
144 { 144 {
145 var access; 145 var access;
146 146
147 navigator.requestMediaKeySystemAccess('org.w3.clearkey', getSimp leConfiguration()).then(function(result) { 147 navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]).t hen(function(result) {
148 access = result; 148 access = result;
149 assert_equals(access.keySystem, 'org.w3.clearkey'); 149 assert_equals(access.keySystem, 'org.w3.clearkey');
150 return access.createMediaKeys(); 150 return access.createMediaKeys();
151 }).then(function(mediaKeys) { 151 }).then(function(mediaKeys) {
152 assert_not_equals(mediaKeys, null); 152 assert_not_equals(mediaKeys, null);
153 assert_equals(typeof mediaKeys, 'object'); 153 assert_equals(typeof mediaKeys, 'object');
154 assert_equals(typeof mediaKeys.createSession, 'function'); 154 assert_equals(typeof mediaKeys.createSession, 'function');
155 assert_equals(typeof mediaKeys.setServerCertificate, 'functi on'); 155 assert_equals(typeof mediaKeys.setServerCertificate, 'functi on');
156 156
157 // Test creation of a second MediaKeys. 157 // Test creation of a second MediaKeys.
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 assert_not_equals(error.message, ""); 221 assert_not_equals(error.message, "");
222 222
223 // Since createSession() failed, |mediaKeySession| is not 223 // Since createSession() failed, |mediaKeySession| is not
224 // touched. 224 // touched.
225 assert_equals(mediaKeySession, 'test'); 225 assert_equals(mediaKeySession, 'test');
226 } 226 }
227 } 227 }
228 228
229 async_test(function(test) 229 async_test(function(test)
230 { 230 {
231 navigator.requestMediaKeySystemAccess('org.w3.clearkey', getSimp leConfiguration()).then(function(access) { 231 navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]).t hen(function(access) {
232 return access.createMediaKeys(); 232 return access.createMediaKeys();
233 }).then(function(mediaKeys) { 233 }).then(function(mediaKeys) {
234 var sessionPromises = kCreateSessionExceptionsTestCases.map( function(testCase) { 234 var sessionPromises = kCreateSessionExceptionsTestCases.map( function(testCase) {
235 return test_exception(testCase, mediaKeys); 235 return test_exception(testCase, mediaKeys);
236 }); 236 });
237 sessionPromises = sessionPromises.concat(test_unsupported_se ssionType(mediaKeys)); 237 sessionPromises = sessionPromises.concat(test_unsupported_se ssionType(mediaKeys));
238 238
239 assert_not_equals(sessionPromises.length, 0); 239 assert_not_equals(sessionPromises.length, 0);
240 return Promise.all(sessionPromises); 240 return Promise.all(sessionPromises);
241 }).then(function(result) { 241 }).then(function(result) {
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 async_test(function(test) 364 async_test(function(test)
365 { 365 {
366 var isWebmSupported; 366 var isWebmSupported;
367 var isCencSupported; 367 var isCencSupported;
368 368
369 isInitDataTypeSupported('webm').then(function(result) { 369 isInitDataTypeSupported('webm').then(function(result) {
370 isWebmSupported = result; 370 isWebmSupported = result;
371 return isInitDataTypeSupported('cenc'); 371 return isInitDataTypeSupported('cenc');
372 }).then(function(result) { 372 }).then(function(result) {
373 isCencSupported = result; 373 isCencSupported = result;
374 return navigator.requestMediaKeySystemAccess('org.w3.clearke y', getSimpleConfiguration()); 374 return navigator.requestMediaKeySystemAccess('org.w3.clearke y', [{}]);
375 }).then(function(access) { 375 }).then(function(access) {
376 return access.createMediaKeys(); 376 return access.createMediaKeys();
377 }).then(function(mediaKeys) { 377 }).then(function(mediaKeys) {
378 var initData = stringToUint8Array('init data'); 378 var initData = stringToUint8Array('init data');
379 var sessionPromises = kGenerateRequestExceptionsTestCases.ma p(function(testCase) { 379 var sessionPromises = kGenerateRequestExceptionsTestCases.ma p(function(testCase) {
380 return test_exception(testCase, mediaKeys, '', initData) ; 380 return test_exception(testCase, mediaKeys, '', initData) ;
381 }); 381 });
382 382
383 // Test that WebM sessions generate the expected error, if 383 // Test that WebM sessions generate the expected error, if
384 // supported. 384 // supported.
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 func: function(mk5) { return mk5.createSession('temporary'). load('!@#$%^&*()'); } 427 func: function(mk5) { return mk5.createSession('temporary'). load('!@#$%^&*()'); }
428 }, 428 },
429 { 429 {
430 exception: 'TypeError', 430 exception: 'TypeError',
431 func: function(mk6) { return mk6.createSession('temporary'). load('1234'); } 431 func: function(mk6) { return mk6.createSession('temporary'). load('1234'); }
432 } 432 }
433 ]; 433 ];
434 434
435 async_test(function(test) 435 async_test(function(test)
436 { 436 {
437 navigator.requestMediaKeySystemAccess('org.w3.clearkey', getSimp leConfiguration()).then(function(access) { 437 navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]).t hen(function(access) {
438 return access.createMediaKeys(); 438 return access.createMediaKeys();
439 }).then(function(mediaKeys) { 439 }).then(function(mediaKeys) {
440 var initData = stringToUint8Array('init data'); 440 var initData = stringToUint8Array('init data');
441 var sessionPromises = kLoadExceptionsTestCases.map(function( testCase) { 441 var sessionPromises = kLoadExceptionsTestCases.map(function( testCase) {
442 return test_exception(testCase, mediaKeys); 442 return test_exception(testCase, mediaKeys);
443 }); 443 });
444 444
445 assert_not_equals(sessionPromises.length, 0); 445 assert_not_equals(sessionPromises.length, 0);
446 return Promise.all(sessionPromises); 446 return Promise.all(sessionPromises);
447 }).then(function(result) { 447 }).then(function(result) {
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 assert_equals(typeof mediaKeySession.generateRequest, 'function' ); 511 assert_equals(typeof mediaKeySession.generateRequest, 'function' );
512 assert_equals(typeof mediaKeySession.load, 'function'); 512 assert_equals(typeof mediaKeySession.load, 'function');
513 assert_equals(typeof mediaKeySession.update, 'function'); 513 assert_equals(typeof mediaKeySession.update, 'function');
514 assert_equals(typeof mediaKeySession.close, 'function'); 514 assert_equals(typeof mediaKeySession.close, 'function');
515 assert_equals(typeof mediaKeySession.remove, 'function'); 515 assert_equals(typeof mediaKeySession.remove, 'function');
516 assert_equals(mediaKeySession.sessionId, ''); 516 assert_equals(mediaKeySession.sessionId, '');
517 } 517 }
518 518
519 async_test(function(test) 519 async_test(function(test)
520 { 520 {
521 navigator.requestMediaKeySystemAccess('org.w3.clearkey', getSimp leConfiguration()).then(function(access) { 521 navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]).t hen(function(access) {
522 return access.createMediaKeys(); 522 return access.createMediaKeys();
523 }).then(function(mediaKeys) { 523 }).then(function(mediaKeys) {
524 kCreateSessionTestCases.map(function(testCase) { 524 kCreateSessionTestCases.map(function(testCase) {
525 test_createSession(testCase, mediaKeys); 525 test_createSession(testCase, mediaKeys);
526 }); 526 });
527 test.done(); 527 test.done();
528 }).catch(function(error) { 528 }).catch(function(error) {
529 forceTestFailureFromPromise(test, error, 'createSession() te sts failed'); 529 forceTestFailureFromPromise(test, error, 'createSession() te sts failed');
530 }); 530 });
531 }, 'Test MediaKeys createSession().'); 531 }, 'Test MediaKeys createSession().');
(...skipping 16 matching lines...) Expand all
548 async_test(function(test) 548 async_test(function(test)
549 { 549 {
550 var isWebmSupported; 550 var isWebmSupported;
551 var isCencSupported; 551 var isCencSupported;
552 552
553 isInitDataTypeSupported('webm').then(function(result) { 553 isInitDataTypeSupported('webm').then(function(result) {
554 isWebmSupported = result; 554 isWebmSupported = result;
555 return isInitDataTypeSupported('cenc'); 555 return isInitDataTypeSupported('cenc');
556 }).then(function(result) { 556 }).then(function(result) {
557 isCencSupported = result; 557 isCencSupported = result;
558 return navigator.requestMediaKeySystemAccess('org.w3.clearke y', getSimpleConfiguration()); 558 return navigator.requestMediaKeySystemAccess('org.w3.clearke y', [{}]);
559 }).then(function(access) { 559 }).then(function(access) {
560 return access.createMediaKeys(); 560 return access.createMediaKeys();
561 }).then(function(mediaKeys) { 561 }).then(function(mediaKeys) {
562 var sessionPromises = []; 562 var sessionPromises = [];
563 563
564 // Test that WebM sessions generate the expected error, if 564 // Test that WebM sessions generate the expected error, if
565 // supported. 565 // supported.
566 if (isWebmSupported) { 566 if (isWebmSupported) {
567 var WebmSessionPromises = kCreateSessionTestCases.map(fu nction(testCase) { 567 var WebmSessionPromises = kCreateSessionTestCases.map(fu nction(testCase) {
568 return test_generateRequest(testCase, mediaKeys, 'we bm', getInitData('webm')); 568 return test_generateRequest(testCase, mediaKeys, 'we bm', getInitData('webm'));
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 async_test(function(test) 624 async_test(function(test)
625 { 625 {
626 var isWebmSupported; 626 var isWebmSupported;
627 var isCencSupported; 627 var isCencSupported;
628 628
629 isInitDataTypeSupported('webm').then(function(result) { 629 isInitDataTypeSupported('webm').then(function(result) {
630 isWebmSupported = result; 630 isWebmSupported = result;
631 return isInitDataTypeSupported('cenc'); 631 return isInitDataTypeSupported('cenc');
632 }).then(function(result) { 632 }).then(function(result) {
633 isCencSupported = result; 633 isCencSupported = result;
634 return navigator.requestMediaKeySystemAccess('org.w3.clearke y', getSimpleConfiguration()); 634 return navigator.requestMediaKeySystemAccess('org.w3.clearke y', [{}]);
635 }).then(function(access) { 635 }).then(function(access) {
636 return access.createMediaKeys(); 636 return access.createMediaKeys();
637 }).then(function(mediaKeys) { 637 }).then(function(mediaKeys) {
638 var promises = []; 638 var promises = [];
639 639
640 if (isWebmSupported) { 640 if (isWebmSupported) {
641 var WebmSessionPromises = kUpdateSessionExceptionsTestCa ses.map(function(testCase) { 641 var WebmSessionPromises = kUpdateSessionExceptionsTestCa ses.map(function(testCase) {
642 var mediaKeySession = mediaKeys.createSession(); 642 var mediaKeySession = mediaKeys.createSession();
643 return mediaKeySession.generateRequest('webm', getIn itData('webm')).then(function(result) { 643 return mediaKeySession.generateRequest('webm', getIn itData('webm')).then(function(result) {
644 return test_exception(testCase, mediaKeySession) ; 644 return test_exception(testCase, mediaKeySession) ;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 async_test(function(test) 684 async_test(function(test)
685 { 685 {
686 var isWebmSupported; 686 var isWebmSupported;
687 var isCencSupported; 687 var isCencSupported;
688 688
689 isInitDataTypeSupported('webm').then(function(result) { 689 isInitDataTypeSupported('webm').then(function(result) {
690 isWebmSupported = result; 690 isWebmSupported = result;
691 return isInitDataTypeSupported('cenc'); 691 return isInitDataTypeSupported('cenc');
692 }).then(function(result) { 692 }).then(function(result) {
693 isCencSupported = result; 693 isCencSupported = result;
694 return navigator.requestMediaKeySystemAccess('org.w3.clearke y', getSimpleConfiguration()); 694 return navigator.requestMediaKeySystemAccess('org.w3.clearke y', [{}]);
695 }).then(function(access) { 695 }).then(function(access) {
696 return access.createMediaKeys(); 696 return access.createMediaKeys();
697 }).then(function(mediaKeys) { 697 }).then(function(mediaKeys) {
698 var promises = []; 698 var promises = [];
699 699
700 if (isWebmSupported) { 700 if (isWebmSupported) {
701 promises.push(create_update_test(mediaKeys, 'webm', getIni tData('webm'))); 701 promises.push(create_update_test(mediaKeys, 'webm', getIni tData('webm')));
702 } 702 }
703 703
704 if (isCencSupported) { 704 if (isCencSupported) {
(...skipping 24 matching lines...) Expand all
729 async_test(function(test) 729 async_test(function(test)
730 { 730 {
731 var isWebmSupported; 731 var isWebmSupported;
732 var isCencSupported; 732 var isCencSupported;
733 733
734 isInitDataTypeSupported('webm').then(function(result) { 734 isInitDataTypeSupported('webm').then(function(result) {
735 isWebmSupported = result; 735 isWebmSupported = result;
736 return isInitDataTypeSupported('cenc'); 736 return isInitDataTypeSupported('cenc');
737 }).then(function(result) { 737 }).then(function(result) {
738 isCencSupported = result; 738 isCencSupported = result;
739 return navigator.requestMediaKeySystemAccess('org.w3.clearke y', getSimpleConfiguration()); 739 return navigator.requestMediaKeySystemAccess('org.w3.clearke y', [{}]);
740 }).then(function(access) { 740 }).then(function(access) {
741 return access.createMediaKeys(); 741 return access.createMediaKeys();
742 }).then(function(mediaKeys) { 742 }).then(function(mediaKeys) {
743 var promises = []; 743 var promises = [];
744 744
745 if (isWebmSupported) { 745 if (isWebmSupported) {
746 promises.push(create_close_exception_test(mediaKeys, 'we bm', getInitData('webm'))); 746 promises.push(create_close_exception_test(mediaKeys, 'we bm', getInitData('webm')));
747 } 747 }
748 748
749 if (isCencSupported) { 749 if (isCencSupported) {
(...skipping 26 matching lines...) Expand all
776 async_test(function(test) 776 async_test(function(test)
777 { 777 {
778 var isWebmSupported; 778 var isWebmSupported;
779 var isCencSupported; 779 var isCencSupported;
780 780
781 isInitDataTypeSupported('webm').then(function(result) { 781 isInitDataTypeSupported('webm').then(function(result) {
782 isWebmSupported = result; 782 isWebmSupported = result;
783 return isInitDataTypeSupported('cenc'); 783 return isInitDataTypeSupported('cenc');
784 }).then(function(result) { 784 }).then(function(result) {
785 isCencSupported = result; 785 isCencSupported = result;
786 return navigator.requestMediaKeySystemAccess('org.w3.clearke y', getSimpleConfiguration()); 786 return navigator.requestMediaKeySystemAccess('org.w3.clearke y', [{}]);
787 }).then(function(access) { 787 }).then(function(access) {
788 return access.createMediaKeys(); 788 return access.createMediaKeys();
789 }).then(function(mediaKeys) { 789 }).then(function(mediaKeys) {
790 var promises = []; 790 var promises = [];
791 791
792 if (isWebmSupported) { 792 if (isWebmSupported) {
793 promises.push(create_close_test(mediaKeys, 'webm', getIn itData('webm'))); 793 promises.push(create_close_test(mediaKeys, 'webm', getIn itData('webm')));
794 } 794 }
795 795
796 if (isCencSupported) { 796 if (isCencSupported) {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
829 async_test(function(test) 829 async_test(function(test)
830 { 830 {
831 var isWebmSupported; 831 var isWebmSupported;
832 var isCencSupported; 832 var isCencSupported;
833 833
834 isInitDataTypeSupported('webm').then(function(result) { 834 isInitDataTypeSupported('webm').then(function(result) {
835 isWebmSupported = result; 835 isWebmSupported = result;
836 return isInitDataTypeSupported('cenc'); 836 return isInitDataTypeSupported('cenc');
837 }).then(function(result) { 837 }).then(function(result) {
838 isCencSupported = result; 838 isCencSupported = result;
839 return navigator.requestMediaKeySystemAccess('org.w3.clearke y', getSimpleConfiguration()); 839 return navigator.requestMediaKeySystemAccess('org.w3.clearke y', [{}]);
840 }).then(function(access) { 840 }).then(function(access) {
841 return access.createMediaKeys(); 841 return access.createMediaKeys();
842 }).then(function(mediaKeys) { 842 }).then(function(mediaKeys) {
843 var promises = []; 843 var promises = [];
844 844
845 if (isWebmSupported) { 845 if (isWebmSupported) {
846 promises.push(create_remove_exception_test(mediaKeys, 'w ebm', getInitData('webm'))); 846 promises.push(create_remove_exception_test(mediaKeys, 'w ebm', getInitData('webm')));
847 } 847 }
848 848
849 if (isCencSupported) { 849 if (isCencSupported) {
(...skipping 28 matching lines...) Expand all
878 async_test(function(test) 878 async_test(function(test)
879 { 879 {
880 var isWebmSupported; 880 var isWebmSupported;
881 var isCencSupported; 881 var isCencSupported;
882 882
883 isInitDataTypeSupported('webm').then(function(result) { 883 isInitDataTypeSupported('webm').then(function(result) {
884 isWebmSupported = result; 884 isWebmSupported = result;
885 return isInitDataTypeSupported('cenc'); 885 return isInitDataTypeSupported('cenc');
886 }).then(function(result) { 886 }).then(function(result) {
887 isCencSupported = result; 887 isCencSupported = result;
888 return navigator.requestMediaKeySystemAccess('org.w3.clearke y', getSimpleConfiguration()); 888 return navigator.requestMediaKeySystemAccess('org.w3.clearke y', [{}]);
889 }).then(function(access) { 889 }).then(function(access) {
890 return access.createMediaKeys(); 890 return access.createMediaKeys();
891 }).then(function(mediaKeys) { 891 }).then(function(mediaKeys) {
892 var promises = []; 892 var promises = [];
893 893
894 if (isWebmSupported) { 894 if (isWebmSupported) {
895 promises.push(create_remove_test(mediaKeys, 'webm', getI nitData('webm'))); 895 promises.push(create_remove_test(mediaKeys, 'webm', getI nitData('webm')));
896 } 896 }
897 897
898 if (isCencSupported) { 898 if (isCencSupported) {
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
933 }, 933 },
934 // Empty array. 934 // Empty array.
935 { 935 {
936 exception: 'TypeError', 936 exception: 'TypeError',
937 func: function(mk) { return mk.setServerCertificate(new Uint 8Array(0)); } 937 func: function(mk) { return mk.setServerCertificate(new Uint 8Array(0)); }
938 } 938 }
939 ]; 939 ];
940 940
941 async_test(function(test) 941 async_test(function(test)
942 { 942 {
943 navigator.requestMediaKeySystemAccess('org.w3.clearkey', getSimp leConfiguration()).then(function(access) { 943 navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]).t hen(function(access) {
944 return access.createMediaKeys(); 944 return access.createMediaKeys();
945 }).then(function(mediaKeys) { 945 }).then(function(mediaKeys) {
946 var promises = kSetServerCertificateExceptionsTestCases.map( function(testCase) { 946 var promises = kSetServerCertificateExceptionsTestCases.map( function(testCase) {
947 return test_exception(testCase, mediaKeys); 947 return test_exception(testCase, mediaKeys);
948 }); 948 });
949 949
950 assert_not_equals(promises.length, 0); 950 assert_not_equals(promises.length, 0);
951 return Promise.all(promises); 951 return Promise.all(promises);
952 }).then(function(result) { 952 }).then(function(result) {
953 test.done(); 953 test.done();
(...skipping 20 matching lines...) Expand all
974 assert_false(ArrayBuffer.isView(buffer)); 974 assert_false(ArrayBuffer.isView(buffer));
975 return mk.setServerCertificate(buffer); 975 return mk.setServerCertificate(buffer);
976 }, 976 },
977 expected: false, 977 expected: false,
978 } 978 }
979 ]; 979 ];
980 980
981 async_test(function(test) 981 async_test(function(test)
982 { 982 {
983 var expected_result; 983 var expected_result;
984 navigator.requestMediaKeySystemAccess('org.w3.clearkey', getSimp leConfiguration()).then(function(access) { 984 navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]).t hen(function(access) {
985 return access.createMediaKeys(); 985 return access.createMediaKeys();
986 }).then(function(mediaKeys) { 986 }).then(function(mediaKeys) {
987 var promises = kSetServerCertificateTestCases.map(function(t estCase) { 987 var promises = kSetServerCertificateTestCases.map(function(t estCase) {
988 return testCase.func.call(null, mediaKeys); 988 return testCase.func.call(null, mediaKeys);
989 }); 989 });
990 expected_result = kSetServerCertificateTestCases.map(functio n(testCase) { 990 expected_result = kSetServerCertificateTestCases.map(functio n(testCase) {
991 return testCase.expected; 991 return testCase.expected;
992 }); 992 });
993 993
994 assert_not_equals(promises.length, 0); 994 assert_not_equals(promises.length, 0);
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
1029 new MediaKeyMessageEvent('eventType', { messageType: 'licens e-request' } ); 1029 new MediaKeyMessageEvent('eventType', { messageType: 'licens e-request' } );
1030 }); 1030 });
1031 }, 'Test MediaKeyMessageEvent.'); 1031 }, 'Test MediaKeyMessageEvent.');
1032 1032
1033 // FIXME: Add syntax checks for MediaKeys.IsTypeSupported(). 1033 // FIXME: Add syntax checks for MediaKeys.IsTypeSupported().
1034 // FIXME: Add syntax checks for MediaKeyError and MediaKeySession ev ents. 1034 // FIXME: Add syntax checks for MediaKeyError and MediaKeySession ev ents.
1035 // FIXME: Add HTMLMediaElement syntax checks, e.g. setMediaKeys, med iakeys, onencrypted. 1035 // FIXME: Add HTMLMediaElement syntax checks, e.g. setMediaKeys, med iakeys, onencrypted.
1036 </script> 1036 </script>
1037 </body> 1037 </body>
1038 </html> 1038 </html>
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-requestmediakeysystemaccess.html ('k') | third_party/WebKit/Source/core/frame/UseCounter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698