| Index: third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-syntax.html
|
| diff --git a/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-syntax.html b/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-syntax.html
|
| index dbf6fe4b00ec4557454c4e7f1b5b7a40df26bef9..bae010049763681354035b990b02a08253a274b6 100644
|
| --- a/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-syntax.html
|
| +++ b/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-syntax.html
|
| @@ -128,7 +128,7 @@
|
| async_test(function(test)
|
| {
|
| assert_equals(typeof navigator.requestMediaKeySystemAccess, 'function');
|
| - navigator.requestMediaKeySystemAccess('org.w3.clearkey', getSimpleConfiguration()).then(function(access) {
|
| + navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]).then(function(access) {
|
| assert_not_equals(access, null);
|
| assert_equals(typeof access, 'object');
|
| assert_equals(access.keySystem, 'org.w3.clearkey');
|
| @@ -144,7 +144,7 @@
|
| {
|
| var access;
|
|
|
| - navigator.requestMediaKeySystemAccess('org.w3.clearkey', getSimpleConfiguration()).then(function(result) {
|
| + navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]).then(function(result) {
|
| access = result;
|
| assert_equals(access.keySystem, 'org.w3.clearkey');
|
| return access.createMediaKeys();
|
| @@ -228,7 +228,7 @@
|
|
|
| async_test(function(test)
|
| {
|
| - navigator.requestMediaKeySystemAccess('org.w3.clearkey', getSimpleConfiguration()).then(function(access) {
|
| + navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]).then(function(access) {
|
| return access.createMediaKeys();
|
| }).then(function(mediaKeys) {
|
| var sessionPromises = kCreateSessionExceptionsTestCases.map(function(testCase) {
|
| @@ -371,7 +371,7 @@
|
| return isInitDataTypeSupported('cenc');
|
| }).then(function(result) {
|
| isCencSupported = result;
|
| - return navigator.requestMediaKeySystemAccess('org.w3.clearkey', getSimpleConfiguration());
|
| + return navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]);
|
| }).then(function(access) {
|
| return access.createMediaKeys();
|
| }).then(function(mediaKeys) {
|
| @@ -434,7 +434,7 @@
|
|
|
| async_test(function(test)
|
| {
|
| - navigator.requestMediaKeySystemAccess('org.w3.clearkey', getSimpleConfiguration()).then(function(access) {
|
| + navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]).then(function(access) {
|
| return access.createMediaKeys();
|
| }).then(function(mediaKeys) {
|
| var initData = stringToUint8Array('init data');
|
| @@ -518,7 +518,7 @@
|
|
|
| async_test(function(test)
|
| {
|
| - navigator.requestMediaKeySystemAccess('org.w3.clearkey', getSimpleConfiguration()).then(function(access) {
|
| + navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]).then(function(access) {
|
| return access.createMediaKeys();
|
| }).then(function(mediaKeys) {
|
| kCreateSessionTestCases.map(function(testCase) {
|
| @@ -555,7 +555,7 @@
|
| return isInitDataTypeSupported('cenc');
|
| }).then(function(result) {
|
| isCencSupported = result;
|
| - return navigator.requestMediaKeySystemAccess('org.w3.clearkey', getSimpleConfiguration());
|
| + return navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]);
|
| }).then(function(access) {
|
| return access.createMediaKeys();
|
| }).then(function(mediaKeys) {
|
| @@ -631,7 +631,7 @@
|
| return isInitDataTypeSupported('cenc');
|
| }).then(function(result) {
|
| isCencSupported = result;
|
| - return navigator.requestMediaKeySystemAccess('org.w3.clearkey', getSimpleConfiguration());
|
| + return navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]);
|
| }).then(function(access) {
|
| return access.createMediaKeys();
|
| }).then(function(mediaKeys) {
|
| @@ -691,7 +691,7 @@
|
| return isInitDataTypeSupported('cenc');
|
| }).then(function(result) {
|
| isCencSupported = result;
|
| - return navigator.requestMediaKeySystemAccess('org.w3.clearkey', getSimpleConfiguration());
|
| + return navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]);
|
| }).then(function(access) {
|
| return access.createMediaKeys();
|
| }).then(function(mediaKeys) {
|
| @@ -736,7 +736,7 @@
|
| return isInitDataTypeSupported('cenc');
|
| }).then(function(result) {
|
| isCencSupported = result;
|
| - return navigator.requestMediaKeySystemAccess('org.w3.clearkey', getSimpleConfiguration());
|
| + return navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]);
|
| }).then(function(access) {
|
| return access.createMediaKeys();
|
| }).then(function(mediaKeys) {
|
| @@ -783,7 +783,7 @@
|
| return isInitDataTypeSupported('cenc');
|
| }).then(function(result) {
|
| isCencSupported = result;
|
| - return navigator.requestMediaKeySystemAccess('org.w3.clearkey', getSimpleConfiguration());
|
| + return navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]);
|
| }).then(function(access) {
|
| return access.createMediaKeys();
|
| }).then(function(mediaKeys) {
|
| @@ -836,7 +836,7 @@
|
| return isInitDataTypeSupported('cenc');
|
| }).then(function(result) {
|
| isCencSupported = result;
|
| - return navigator.requestMediaKeySystemAccess('org.w3.clearkey', getSimpleConfiguration());
|
| + return navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]);
|
| }).then(function(access) {
|
| return access.createMediaKeys();
|
| }).then(function(mediaKeys) {
|
| @@ -885,7 +885,7 @@
|
| return isInitDataTypeSupported('cenc');
|
| }).then(function(result) {
|
| isCencSupported = result;
|
| - return navigator.requestMediaKeySystemAccess('org.w3.clearkey', getSimpleConfiguration());
|
| + return navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]);
|
| }).then(function(access) {
|
| return access.createMediaKeys();
|
| }).then(function(mediaKeys) {
|
| @@ -940,7 +940,7 @@
|
|
|
| async_test(function(test)
|
| {
|
| - navigator.requestMediaKeySystemAccess('org.w3.clearkey', getSimpleConfiguration()).then(function(access) {
|
| + navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]).then(function(access) {
|
| return access.createMediaKeys();
|
| }).then(function(mediaKeys) {
|
| var promises = kSetServerCertificateExceptionsTestCases.map(function(testCase) {
|
| @@ -981,7 +981,7 @@
|
| async_test(function(test)
|
| {
|
| var expected_result;
|
| - navigator.requestMediaKeySystemAccess('org.w3.clearkey', getSimpleConfiguration()).then(function(access) {
|
| + navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]).then(function(access) {
|
| return access.createMediaKeys();
|
| }).then(function(mediaKeys) {
|
| var promises = kSetServerCertificateTestCases.map(function(testCase) {
|
|
|