Bug 1139021 - Don't run extra collections in the parent process for the mochitest window leak detector. r=jmaher

testing/mochitest/ShutdownLeaksCollector.jsm

@@ -17,6 +17,12 @@ this.EXPORTED_SYMBOLS = ["ContentCollector"];
 
 var ContentCollector = {
   init: function() {
+      let processType = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).processType;
+      if (processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT) {
+        // In the main process, we handle triggering collections in browser-test.js
+        return;
+      }
+
     let cpmm = Cc["@mozilla.org/childprocessmessagemanager;1"]
                  .getService(Ci.nsISyncMessageSender);
     cpmm.addMessageListener("browser-test:collect-request", this);

testing/mochitest/browser-test.js

@@ -291,6 +291,11 @@ Tester.prototype = {
       Services.obs.removeObserver(this, "content-document-global-created");
       this.Promise.Debugging.clearUncaughtErrorObservers();
       this._treatUncaughtRejectionsAsFailures = false;
+
+      // In the main process, we print the ShutdownLeaksCollector message here.
+      let pid = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).processID;
+      dump("Completed ShutdownLeaks collections in process " + pid + "\n");
+
       this.dumper.structuredLogger.info("TEST-START | Shutdown");
 
       if (this.tests.length) {