Bug 343165 - Make debug.js appear everywhere, patch by Dave Townsend (Mossop), r=mconnor

browser/base/content/browser.js

@@ -6676,7 +6676,6 @@ var BrowserController = {
 window.controllers.appendController(BrowserController);
 
 #include browser-places.js
-#include ../../../toolkit/content/debug.js
 
 #endif
 

toolkit/content/debug.js

@@ -42,7 +42,6 @@
 # This file contains functions that are useful for debugging purposes from
 # within JavaScript code.
 
-const NS_ASSERT_ENVIRONMENT_VARIABLE_NAME = "XUL_ASSERT_PROMPT";
 var gTraceOnAssert = true;
 
 /**
@@ -89,8 +88,8 @@ function NS_ASSERT(condition, message) {
 
   var environment = Components.classes["@mozilla.org/process/environment;1"].
                     getService(Components.interfaces.nsIEnvironment);
-  if (environment.exists(NS_ASSERT_ENVIRONMENT_VARIABLE_NAME) &&
-      !parseInt(environment.get(NS_ASSERT_ENVIRONMENT_VARIABLE_NAME)))
+  if (environment.exists("XUL_ASSERT_PROMPT") &&
+      !parseInt(environment.get("XUL_ASSERT_PROMPT")))
     return;
 
   var source = null;

toolkit/content/globalOverlay.js

@@ -256,3 +256,5 @@ function FillInTooltip ( tipElement )
   }
   return retVal;
 }
+
+#include debug.js