summaryrefslogtreecommitdiffstats
path: root/dom/media
diff options
context:
space:
mode:
authoradeshkp <adeshkp@users.noreply.github.com>2019-11-09 22:27:08 +0530
committeradeshkp <adeshkp@users.noreply.github.com>2019-11-10 06:04:09 -0500
commitc43b770a0399b5e03a6f6e4d2292e0408b186433 (patch)
tree292d5e9683bc962da75570639702e8d32c1f96ef /dom/media
parent400f0e2df8dd8ac09c5d97205aecdc3310a5c893 (diff)
downloadUXP-c43b770a0399b5e03a6f6e4d2292e0408b186433.tar
UXP-c43b770a0399b5e03a6f6e4d2292e0408b186433.tar.gz
UXP-c43b770a0399b5e03a6f6e4d2292e0408b186433.tar.lz
UXP-c43b770a0399b5e03a6f6e4d2292e0408b186433.tar.xz
UXP-c43b770a0399b5e03a6f6e4d2292e0408b186433.zip
Issue #1259 - Part 7. Update tests for Adobe EME removal
Diffstat (limited to 'dom/media')
-rw-r--r--dom/media/test/external/external_media_harness/testcase.py26
1 files changed, 0 insertions, 26 deletions
diff --git a/dom/media/test/external/external_media_harness/testcase.py b/dom/media/test/external/external_media_harness/testcase.py
index 56350ccd9..35a944484 100644
--- a/dom/media/test/external/external_media_harness/testcase.py
+++ b/dom/media/test/external/external_media_harness/testcase.py
@@ -200,19 +200,6 @@ class NetworkBandwidthTestsMixin(object):
self.run_videos(timeout=120)
-reset_adobe_gmp_script = """
-navigator.requestMediaKeySystemAccess('com.adobe.primetime',
-[{initDataTypes: ['cenc']}]).then(
- function(access) {
- marionetteScriptFinished('success');
- },
- function(ex) {
- marionetteScriptFinished(ex);
- }
-);
-"""
-
-
reset_widevine_gmp_script = """
navigator.requestMediaKeySystemAccess('com.widevine.alpha',
[{initDataTypes: ['cenc']}]).then(
@@ -256,21 +243,12 @@ class EMESetupMixin(object):
def reset_GMP_version(self):
if EMESetupMixin.version_needs_reset:
with self.marionette.using_context(Marionette.CONTEXT_CHROME):
- if self.marionette.get_pref('media.gmp-eme-adobe.version'):
- self.marionette.reset_pref('media.gmp-eme-adobe.version')
if self.marionette.get_pref('media.gmp-widevinecdm.version'):
self.marionette.reset_pref('media.gmp-widevinecdm.version')
with self.marionette.using_context(Marionette.CONTEXT_CONTENT):
- adobe_result = self.marionette.execute_async_script(
- reset_adobe_gmp_script,
- script_timeout=60000)
widevine_result = self.marionette.execute_async_script(
reset_widevine_gmp_script,
script_timeout=60000)
- if not adobe_result == 'success':
- raise VideoException(
- 'ERROR: Resetting Adobe GMP failed {}'
- .format(adobe_result))
if not widevine_result == 'success':
raise VideoException(
'ERROR: Resetting Widevine GMP failed {}'
@@ -352,10 +330,6 @@ class EMESetupMixin(object):
self.check_and_log_boolean_pref(
'media.mediasource.mp4.enabled', True),
self.check_and_log_boolean_pref(
- 'media.gmp-eme-adobe.enabled', True),
- self.check_and_log_integer_pref(
- 'media.gmp-eme-adobe.version', 1),
- self.check_and_log_boolean_pref(
'media.gmp-widevinecdm.enabled', True),
self.chceck_and_log_version_string_pref(
'media.gmp-widevinecdm.version', '1.0.0.0')