Backed out changeset b77388326b1b (bug 1630982) for causing leaks on mochitest jobs. CLOSED TREE

js/xpconnect/idl/xpccomponents.idl

@@ -495,10 +495,6 @@ interface nsIXPCComponents_Utils : nsISupports
     // restrictions can be eased.
     readonly attribute boolean isInAutomation;
 
-    // Called by automated tests to exit immediately after we are done getting
-    // test results.
-    void exitIfInAutomation();
-
     void crashIfNotInAutomation();
 
     [implicit_jscontext]

js/xpconnect/src/XPCComponents.cpp

@@ -20,7 +20,6 @@
 #include "js/ContextOptions.h"
 #include "js/SavedFrameAPI.h"
 #include "js/StructuredClone.h"
-#include "mozilla/AppShutdown.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/jsipc/CrossProcessObjectWrappers.h"
 #include "mozilla/LoadContext.h"
@@ -2091,18 +2090,6 @@ nsXPCComponents_Utils::GetIsInAutomation(bool* aResult) {
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsXPCComponents_Utils::ExitIfInAutomation() {
-  NS_ENSURE_TRUE(xpc::IsInAutomation(), NS_ERROR_FAILURE);
-
-#ifdef MOZ_GECKO_PROFILER
-  profiler_shutdown(IsFastShutdown::Yes);
-#endif
-
-  mozilla::AppShutdown::DoImmediateExit();
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsXPCComponents_Utils::CrashIfNotInAutomation() {
   xpc::CrashIfNotInAutomation();

testing/mochitest/browser-harness.xhtml

@@ -322,14 +322,15 @@
     }
 
     function testsFinished(aTests) {
-      if (gConfig.closeWhenDone) {
-        Cu.exitIfInAutomation();
-        return;
-      }
-
       // Focus our window, to display the results
       window.focus();
 
+      if (gConfig.closeWhenDone) {
+        let appStartup = Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup);
+        appStartup.quit(Ci.nsIAppStartup.eForceQuit);
+        return;
+      }
+
       // UI
       document.getElementById("results").innerHTML = getHTMLLogFromTests(aTests);
       setStatus("Done.");

testing/mochitest/browser-test.js

@@ -815,15 +815,6 @@ Tester.prototype = {
       if (this.done) {
         if (this._coverageCollector) {
           this._coverageCollector.finalize();
-        } else if (
-          !AppConstants.RELEASE_OR_BETA &&
-          !AppConstants.DEBUG &&
-          !AppConstants.MOZ_CODE_COVERAGE &&
-          !AppConstants.ASAN &&
-          !AppConstants.TSAN
-        ) {
-          this.finish();
-          return;
         }
 
         // Uninitialize a few things explicitly so that they can clean up

toolkit/modules/AppConstants.jsm

@@ -254,13 +254,6 @@ this.AppConstants = Object.freeze({
   false,
 #endif
 
-  TSAN:
-#ifdef MOZ_TSAN
-  true,
-#else
-  false,
-#endif
-
   MOZ_SYSTEM_NSS:
 #ifdef MOZ_SYSTEM_NSS
   true,