Backed out changeset ed7d7a895962 (bug 1283065)

testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py

@@ -23,8 +23,8 @@ from mozharness.mozilla.testing.testbase import (
 )
 from mozharness.mozilla.vcstools import VCSToolsScript
 
-# Command line arguments for firefox ui tests
-firefox_ui_tests_harness_config_options = [
+deprecated_options = [
+    # TODO update mozmill-ci jobs to use --disable-e10s instead?
     [["--e10s"], {
         'dest': 'e10s',
         'action': 'store_true',
@@ -54,7 +54,7 @@ firefox_ui_tests_config_options = [
         'help': 'absolute path to directory containing breakpad '
                 'symbols, or the url of a zip file containing symbols.',
     }],
-] + firefox_ui_tests_harness_config_options \
+] + deprecated_options \
     + copy.deepcopy(testing_config_options)
 
 # Command line arguments for update tests
@@ -228,8 +228,7 @@ class FirefoxUITests(TestingMixin, VCSToolsScript):
 
         Sub classes should override this method for their own specific arguments.
         """
-        extra_harness_config_options = extra_harness_config_options or []
-        config_options = firefox_ui_tests_harness_config_options + extra_harness_config_options
+        config_options = extra_harness_config_options or []
 
         args = []
         for option in config_options: