| Index: chrome/test/data/media/eme_player_js/globals.js
|
| diff --git a/chrome/test/data/media/eme_player_js/globals.js b/chrome/test/data/media/eme_player_js/globals.js
|
| index 6722759d26fd15e7001dcdba150906d9ecbf7a2e..2e19ac5b1f3a6e89fdc512e65047ccb320f5cc47 100644
|
| --- a/chrome/test/data/media/eme_player_js/globals.js
|
| +++ b/chrome/test/data/media/eme_player_js/globals.js
|
| @@ -18,20 +18,11 @@
|
| // Key ID used for init data.
|
| var KEY_ID = '0123456789012345';
|
|
|
| -// Unique strings to identify test result expectations.
|
| -var KEY_ERROR = 'KEY_ERROR';
|
| -var FILE_IO_TEST_RESULT_HEADER = 'FILEIOTESTRESULT';
|
| -var FILE_IO_TEST_SUCCESS = 'FILE_IO_TEST_SUCCESS';
|
| -var PREFIXED_API_LOAD_SESSION_HEADER = "LOAD_SESSION|";
|
| -
|
| // Available EME key systems to use.
|
| var PREFIXED_CLEARKEY = 'webkit-org.w3.clearkey';
|
| var CLEARKEY = 'org.w3.clearkey';
|
| var EXTERNAL_CLEARKEY = 'org.chromium.externalclearkey';
|
| var WIDEVINE_KEYSYSTEM = 'com.widevine.alpha';
|
| -var FILE_IO_TEST_KEYSYSTEM = 'org.chromium.externalclearkey.fileiotest';
|
| -var EME_PREFIXED_VERSION = 'Prefixed EME (v 0.1b)';
|
| -var EME_UNPREFIXED_VERSION = 'Unprefixed EME (Working draft)';
|
|
|
| // Key system name:value map to show on the document page.
|
| var KEY_SYSTEMS = {
|
| @@ -51,14 +42,11 @@
|
|
|
| // Update the EME versions list by checking runtime support by the browser.
|
| var EME_VERSIONS_OPTIONS = {};
|
| -EME_VERSIONS_OPTIONS[EME_UNPREFIXED_VERSION] = EME_UNPREFIXED_VERSION;
|
| -EME_VERSIONS_OPTIONS[EME_PREFIXED_VERSION] = EME_PREFIXED_VERSION;
|
| -
|
| -var EME_DISABLED_OPTIONS = [];
|
| -if (!document.createElement('video').webkitAddKey)
|
| - EME_DISABLED_OPTIONS.push(EME_PREFIXED_VERSION);
|
| -if (!document.createElement('video').setMediaKeys)
|
| - EME_DISABLED_OPTIONS.push(EME_UNPREFIXED_VERSION);
|
| +var video = document.createElement('video');
|
| +if (video.webkitAddKey)
|
| + EME_VERSIONS_OPTIONS['Prefixed EME (v 0.1b)'] = 'true';
|
| +if (video.setMediaKeys)
|
| + EME_VERSIONS_OPTIONS['Unprefixed EME (Working draft)'] = 'false';
|
|
|
| // Global document elements ID's.
|
| var VIDEO_ELEMENT_ID = 'video';
|
|
|