Backed out 2 changesets (bug 1849972) as requested by whimboo CLOSED …

…TREE

Backed out changeset d8ac28803dd6 (bug 1849972)
Backed out changeset 57929c2e184a (bug 1849972)

gecko-commit: 24c5f0ac0033f113e83081775c276aa128156462

tools/wptrunner/wptrunner/browsers/firefox.py

@@ -913,6 +913,11 @@ def get_env(self, binary, debug_info, headless, chaos_mode_flags):
                           headless,
                           chaos_mode_flags)
         env["RUST_BACKTRACE"] = "1"
+        # This doesn't work with wdspec tests
+        # In particular tests can create a session without passing in the capabilites
+        # and in those cases we get the default geckodriver profile which doesn't
+        # guarantee zero network access
+        del env["MOZ_DISABLE_NONLOCAL_CONNECTIONS"]
         return env
 
     def create_output_handler(self, cmd):

tools/wptrunner/wptrunner/browsers/firefox_android.py

@@ -349,6 +349,7 @@ def stop(self, force=False):
     def get_env(self, binary, debug_info, headless, chaos_mode_flags):
         env = get_environ(chaos_mode_flags)
         env["RUST_BACKTRACE"] = "1"
+        del env["MOZ_DISABLE_NONLOCAL_CONNECTIONS"]
         return env
 
     def executor_browser(self):