Bug 1205348 - Always do shutdown CCs when NS_FREE_PERMANENT_DATA is defined. r=smaug

testing/mozbase/mozrunner/mozrunner/utils.py

@@ -215,8 +215,6 @@ def test_environment(xrePath, env=None, crashreporter=True, debugger=False,
                     log.info("WARNING | runtests.py | LSan suppressions file"
                              " does not exist! " + suppressionsFile)
                 env["LSAN_OPTIONS"] = ':'.join(lsanOptions)
-                # Run shutdown GCs and CCs to avoid spurious leaks.
-                env['MOZ_CC_RUN_DURING_SHUTDOWN'] = '1'
 
             if len(asanOptions):
                 env['ASAN_OPTIONS'] = ':'.join(asanOptions)

xpcom/base/nsCycleCollector.cpp

@@ -3829,7 +3829,7 @@ nsCycleCollector::Shutdown()
   // Always delete snow white objects.
   FreeSnowWhite(true);
 
-#ifndef DEBUG
+#ifndef NS_FREE_PERMANENT_DATA
   if (PR_GetEnv("MOZ_CC_RUN_DURING_SHUTDOWN"))
 #endif
   {