From a01046b97fd33cf6b7be0eb1859c0724714a9518 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 12 Sep 2013 14:28:55 -0400
Subject: [PATCH] Backed out changeset 9157ea42ff41 (bug 914925) for
 Android/B2G test bustage.

---
 build/automation.py.in             | 4 ++--
 layout/tools/reftest/runreftest.py | 6 +++---
 testing/mochitest/runtests.py      | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build/automation.py.in b/build/automation.py.in
index d8ee56579d8b..b6147464f596 100644
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -471,7 +471,7 @@ class Automation(object):
     os.unlink(pwfilePath)
     return 0
 
-  def environment(self, env = None, xrePath = None, crashreporter = True, debugger = False):
+  def environment(self, env = None, xrePath = None, crashreporter = True):
     if xrePath == None:
       xrePath = self.DIST_BIN
     if env == None:
@@ -490,7 +490,7 @@ class Automation(object):
     elif self.IS_WIN32:
       env["PATH"] = env["PATH"] + ";" + str(ldLibraryPath)
 
-    if crashreporter and not debugger:
+    if crashreporter:
       env['MOZ_CRASHREPORTER_NO_REPORT'] = '1'
       env['MOZ_CRASHREPORTER'] = '1'
     else:
diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py
index 7af0d8675c8b..50001396e3cf 100644
--- a/layout/tools/reftest/runreftest.py
+++ b/layout/tools/reftest/runreftest.py
@@ -108,8 +108,8 @@ class RefTest(object):
     self.copyExtraFilesToProfile(options, profile)
     return profile
 
-  def buildBrowserEnv(self, options, profileDir, debugger = False):
-    browserEnv = self.automation.environment(xrePath = options.xrePath, debugger = debugger)
+  def buildBrowserEnv(self, options, profileDir):
+    browserEnv = self.automation.environment(xrePath = options.xrePath)
     browserEnv["XPCOM_DEBUG_BREAK"] = "stack"
 
     for v in options.environment:
@@ -141,7 +141,7 @@ class RefTest(object):
       profileDir = profile.profile # name makes more sense
 
       # browser environment
-      browserEnv = self.buildBrowserEnv(options, profileDir, debuggerInfo is not None)
+      browserEnv = self.buildBrowserEnv(options, profileDir)
 
       self.automation.log.info("REFTEST INFO | runreftest.py | Running tests: start.\n")
       status = self.automation.runApp(None, browserEnv, options.app, profileDir,
diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py
index 16961fc9da82..cfd25ec56376 100644
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -487,9 +487,9 @@ class Mochitest(MochitestUtilsMixin):
     self.copyExtraFilesToProfile(options)
     return manifest
 
-  def buildBrowserEnv(self, options, debugger = False):
+  def buildBrowserEnv(self, options):
     """ build the environment variables for the specific test and operating system """
-    browserEnv = self.automation.environment(xrePath = options.xrePath, debugger = debugger)
+    browserEnv = self.automation.environment(xrePath = options.xrePath)
 
     # These variables are necessary for correct application startup; change
     # via the commandline at your own risk.
@@ -551,7 +551,7 @@ class Mochitest(MochitestUtilsMixin):
 
     self.leak_report_file = os.path.join(options.profilePath, "runtests_leaks.log")
 
-    browserEnv = self.buildBrowserEnv(options, debuggerInfo is not None)
+    browserEnv = self.buildBrowserEnv(options)
     if browserEnv is None:
       return 1