Remove crashreporter/URL references throughout the tree.

5 files changed, 2 insertions, 24 deletions

diff --git a/build/automation-build.mk b/build/automation-build.mk
index eca32f71b..9a04c3c87 100644
--- a/build/automation-build.mk
+++ b/build/automation-build.mk
@@ -54,8 +54,6 @@ else
 AUTOMATION_PPARGS += -DIS_DEBUG_BUILD=0
 endif
 
-AUTOMATION_PPARGS += -DCRASHREPORTER=0
-
 ifdef MOZ_ASAN
 AUTOMATION_PPARGS += -DIS_ASAN=1
 else
diff --git a/build/automation.py.in b/build/automation.py.in
index 594955ab6..987f8e1a8 100644
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -68,7 +68,6 @@ _IS_CYGWIN = False
 #expand _CERTS_SRC_DIR = __CERTS_SRC_DIR__
 #expand _IS_TEST_BUILD = __IS_TEST_BUILD__
 #expand _IS_DEBUG_BUILD = __IS_DEBUG_BUILD__
-#expand _CRASHREPORTER = __CRASHREPORTER__ == 1
 #expand _IS_ASAN = __IS_ASAN__ == 1
 
 
@@ -145,7 +144,6 @@ class Automation(object):
   CERTS_SRC_DIR = _CERTS_SRC_DIR
   IS_TEST_BUILD = _IS_TEST_BUILD
   IS_DEBUG_BUILD = _IS_DEBUG_BUILD
-  CRASHREPORTER = _CRASHREPORTER
   IS_ASAN = _IS_ASAN
 
   # timeout, in seconds
@@ -717,7 +715,7 @@ user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless t
     os.unlink(pwfilePath)
     return 0
 
-  def environment(self, env = None, xrePath = None, crashreporter = True):
+  def environment(self, env = None, xrePath = None):
     if xrePath == None:
       xrePath = self.DIST_BIN
     if env == None:
@@ -736,8 +734,6 @@ user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless t
     elif self.IS_WIN32:
       env["PATH"] = env["PATH"] + ";" + ldLibraryPath
 
-    env['MOZ_CRASHREPORTER_DISABLE'] = '1'
-
     env['GNOME_DISABLE_CRASH_DIALOG'] = '1'
     env['XRE_NO_WINDOWS_CRASH_DIALOG'] = '1'
     env['NS_TRACE_MALLOC_DISABLE_STACKS'] = '1'
@@ -912,18 +908,6 @@ user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless t
 
   def killAndGetStackNoScreenshot(self, processPID, utilityPath, debuggerInfo):
     """Kill the process, preferrably in a way that gets us a stack trace."""
-    if self.CRASHREPORTER and not debuggerInfo:
-      if self.UNIXISH:
-        # ABRT will get picked up by Breakpad's signal handler
-        os.kill(processPID, signal.SIGABRT)
-        return
-      elif self.IS_WIN32:
-        # We should have a "crashinject" program in our utility path
-        crashinject = os.path.normpath(os.path.join(utilityPath, "crashinject.exe"))
-        if os.path.exists(crashinject) and subprocess.Popen([crashinject, str(processPID)]).wait() == 0:
-          return
-      #TODO: kill the process such that it triggers Breakpad on OS X (bug 525296)
-    self.log.info("Can't trigger Breakpad, just killing process")
     self.killPid(processPID)
 
   def waitForFinish(self, proc, utilityPath, timeout, maxTime, startTime, debuggerInfo, symbolsPath):
@@ -1107,8 +1091,7 @@ user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless t
 
     self.lastTestSeen = "automation.py"
     proc = self.Process([cmd] + args,
-                 env = self.environment(env, xrePath = xrePath,
-                                   crashreporter = not debuggerInfo),
+                 env = self.environment(env, xrePath = xrePath),
                  stdout = outputPipe,
                  stderr = subprocess.STDOUT)
     self.log.info("INFO | automation.py | Application pid: %d", proc.pid)
diff --git a/build/dumbmake-dependencies b/build/dumbmake-dependencies
index be31b1802..f38b7e08d 100644
--- a/build/dumbmake-dependencies
+++ b/build/dumbmake-dependencies
@@ -57,7 +57,6 @@ browser/app
   toolkit
   toolkit/components
   toolkit/content
-  toolkit/crashreporter
   toolkit/devtools
   toolkit/forgetaboutsite
   toolkit/identity
diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py
index fae1775e3..8b26ed232 100644
--- a/build/pgo/profileserver.py
+++ b/build/pgo/profileserver.py
@@ -52,7 +52,6 @@ if __name__ == '__main__':
                              locations=locations)
 
     env = os.environ.copy()
-    env["MOZ_CRASHREPORTER_NO_REPORT"] = "1"
     env["XPCOM_DEBUG_BREAK"] = "warn"
     jarlog = os.getenv("JARLOG_FILE")
     if jarlog:
diff --git a/build/unix/mozconfig.asan b/build/unix/mozconfig.asan
index 9df4b30bf..c8d2c5130 100644
--- a/build/unix/mozconfig.asan
+++ b/build/unix/mozconfig.asan
@@ -18,5 +18,4 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols
 ac_add_options --disable-install-strip
 ac_add_options --disable-jemalloc
-ac_add_options --disable-crashreporter
 ac_add_options --disable-elf-hack