Remove more crashreporter references/stubs

Makefile.in

@@ -187,7 +187,6 @@ MAKE_SYM_STORE_ARGS := -c --vcs-info
 ifdef PDBSTR_PATH
 MAKE_SYM_STORE_ARGS += -i
 endif
-DUMP_SYMS_BIN ?= $(topsrcdir)/toolkit/crashreporter/tools/win32/dump_syms_vc$(_MSC_VER).exe
 # PDB files don't get moved to dist, so we need to scan the whole objdir
 MAKE_SYM_STORE_PATH := .
 endif

browser/locales/Makefile.in

@@ -8,13 +8,6 @@ include $(topsrcdir)/config/config.mk
 vpath %.xml @srcdir@/en-US/searchplugins
 vpath %.xml $(LOCALE_SRCDIR)/searchplugins
 
-ifdef LOCALE_MERGEDIR
-vpath crashreporter%.ini $(LOCALE_MERGEDIR)/browser/crashreporter
-endif
-vpath crashreporter%.ini $(LOCALE_SRCDIR)/crashreporter
-ifdef LOCALE_MERGEDIR
-vpath crashreporter%.ini @srcdir@/en-US/crashreporter
-endif
 ifdef LOCALE_MERGEDIR
 vpath book%.inc $(LOCALE_MERGEDIR)/browser/profile
 endif

build/automation-build.mk

@@ -48,8 +48,6 @@ else
 AUTOMATION_PPARGS += -DIS_DEBUG_BUILD=0
 endif
 
-AUTOMATION_PPARGS += -DCRASHREPORTER=0
-
 ifdef MOZ_ASAN
 AUTOMATION_PPARGS += -DIS_ASAN=1
 else

build/automationutils.py

@@ -287,7 +287,7 @@ def systemMemory():
   """
   return int(os.popen("free").readlines()[1].split()[1])
 
-def environment(xrePath, env=None, crashreporter=True, debugger=False, dmdPath=None, lsanPath=None):
+def environment(xrePath, env=None, debugger=False, dmdPath=None, lsanPath=None):
   """populate OS environment variables for mochitest"""
 
   env = os.environ.copy() if env is None else env
@@ -327,16 +327,6 @@ def environment(xrePath, env=None, crashreporter=True, debugger=False, dmdPath=N
   if dmdPath and dmdLibrary and preloadEnvVar:
     env[preloadEnvVar] = os.path.join(dmdPath, dmdLibrary)
 
-  # crashreporter
-  env['GNOME_DISABLE_CRASH_DIALOG'] = '1'
-  env['XRE_NO_WINDOWS_CRASH_DIALOG'] = '1'
-
-  if crashreporter and not debugger:
-    env['MOZ_CRASHREPORTER_NO_REPORT'] = '1'
-    env['MOZ_CRASHREPORTER'] = '1'
-  else:
-    env['MOZ_CRASHREPORTER_DISABLE'] = '1'
-
   # Crash on non-local network connections by default.
   # MOZ_DISABLE_NONLOCAL_CONNECTIONS can be set to "0" to temporarily
   # enable non-local connections for the purposes of local testing.  Don't

build/docs/mozinfo.rst

@@ -65,13 +65,6 @@ buildapp
    For desktop Firefox, this is ``browser``. For Fennec, it's
    ``mobile/android``. For B2G, it's ``b2g``.
 
-crashreporter
-   Whether the crash reporter is enabled for this build.
-
-   Values are ``true`` and ``false``.
-
-   Always defined.
-
 datareporting
    Whether data reporting (MOZ_DATA_REPORTING) is enabled for this build.
 

build/dumbmake-dependencies

@@ -59,7 +59,6 @@ browser/app
   toolkit/components
   toolkit/components/jsdownloads
   toolkit/content
-  toolkit/crashreporter
   toolkit/devtools
   toolkit/forgetaboutsite
   toolkit/identity

build/gen_mach_buildprops.py

@@ -45,8 +45,6 @@ def getUrlProperties(filename, package):
     # rather than a long if/else with duplicate code
     property_conditions = [
         # key: property name, value: condition
-        ('symbolsUrl', lambda m: m.endswith('crashreporter-symbols.zip') or
-                       m.endswith('crashreporter-symbols-full.zip')),
         ('testsUrl', lambda m: m.endswith(('tests.tar.bz2', 'tests.zip'))),
         ('unsignedApkUrl', lambda m: m.endswith('apk') and
                            'unsigned-unaligned' in m),

build/mozconfig.common

@@ -12,8 +12,6 @@
 
 mk_add_options AUTOCLOBBER=1
 
-ac_add_options --enable-crashreporter
-
 ac_add_options --enable-release
 
 . "$topsrcdir/build/mozconfig.automation"

build/unix/mozconfig.asan

@@ -21,7 +21,6 @@ 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
 
 # Avoid dependency on libstdc++ 4.7

build/win32/Makefile.in

@@ -25,5 +25,3 @@ endif # WIN32_REDIST_DIR
 # run the binscope tool to make sure the binary and all libraries
 # are using all available Windows OS-level security mechanisms
 check::
-	$(PYTHON) $(srcdir)/autobinscope.py $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/crashreporter-symbols/
-	$(PYTHON) $(srcdir)/autobinscope.py $(DIST)/bin/plugin-container.exe $(DIST)/crashreporter-symbols/

ipc/glue/GoannaChildProcessHost.cpp

@@ -21,8 +21,6 @@
 #include "prenv.h"
 #include "nsXPCOMPrivate.h"
 
-#include "nsExceptionHandler.h"
-
 #include "nsDirectoryServiceDefs.h"
 #include "nsIFile.h"
 
@@ -50,9 +48,8 @@ using mozilla::MonitorAutoLock;
 using mozilla::ipc::GoannaChildProcessHost;
 
 #ifdef ANDROID
-// Like its predecessor in nsExceptionHandler.cpp, this is
-// the magic number of a file descriptor remapping we must
-// preserve for the child process.
+// This is the magic number of a file descriptor
+// remapping we must preserve for the child process.
 static const int kMagicAndroidSystemPropFd = 5;
 #endif
 

ipc/glue/moz.build

@@ -160,10 +160,6 @@ for var in ('MOZ_CHILD_PROCESS_NAME', 'MOZ_CHILD_PROCESS_BUNDLE',
             'DLL_PREFIX', 'DLL_SUFFIX'):
     DEFINES[var] = '"%s"' % CONFIG[var]
 
-LOCAL_INCLUDES += [
-    '/toolkit/crashreporter',
-]
-
 if CONFIG['OS_ARCH'] == 'WINNT':
     LOCAL_INCLUDES += [
         '/security/sandbox/win/src/sandboxbroker',

modules/libpref/init/all.js

@@ -2375,9 +2375,6 @@ pref("dom.ipc.plugins.java.enabled", false);
 
 pref("dom.ipc.plugins.flash.disable-protected-mode", false);
 
-pref("dom.ipc.plugins.flash.subprocess.crashreporter.enabled", true);
-pref("dom.ipc.plugins.reportCrashURL", true);
-
 // How long we wait before unloading an idle plugin process.
 // Defaults to 30 seconds.
 pref("dom.ipc.plugins.unloadTimeoutSecs", 30);

python/mozbuild/mozbuild/mozinfo.py

@@ -78,7 +78,6 @@ def build_dict(config, env=os.environ):
     # other CPUs will wind up with unknown bits
 
     d['debug'] = substs.get('MOZ_DEBUG') == '1'
-    d['crashreporter'] = bool(substs.get('MOZ_CRASHREPORTER'))
     d['datareporting'] = bool(substs.get('MOZ_DATA_REPORTING'))
     d['healthreport'] = substs.get('MOZ_SERVICES_HEALTHREPORT') == '1'
     d['asan'] = substs.get('MOZ_ASAN') == '1'

services/healthreport/modules-testing/utils.jsm

@@ -92,8 +92,6 @@ this.updateAppInfo = function (obj) {
  * Currently, we just create a dummy file. A more robust implementation would
  * create something that actually resembles a crash report file.
  *
- * This is very similar to code in crashreporter/tests/browser/head.js.
- *
  * FUTURE consolidate code in a shared JSM.
  */
 this.createFakeCrash = function (submitted=false, date=new Date()) {

toolkit/content/license.html

@@ -2367,9 +2367,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
     <h1><a id="google-bsd"></a>Google BSD License</h1>
 
-    <p>This license applies to files in the directories
-    <span class="path">toolkit/crashreporter/google-breakpad/</span>,
-    <span class="path">camino/google-breakpad/</span> and
+    <p>This license applies to files in the directory
     <span class="path">toolkit/components/protobuf/</span>.</p>
 
 <pre>

toolkit/locales/Makefile.in

@@ -6,14 +6,6 @@ XULPPFLAGS += -I$(LOCALE_SRCDIR)/defines.inc
 
 include $(topsrcdir)/config/rules.mk
 
-ifdef LOCALE_MERGEDIR
-vpath crashreporter.% $(LOCALE_MERGEDIR)/toolkit/crashreporter
-endif
-vpath crashreporter.% $(LOCALE_SRCDIR)/crashreporter
-ifdef LOCALE_MERGEDIR
-vpath crashreporter.% @srcdir@/en-US/crashreporter
-endif
-
 libs-%:
 	@$(MAKE) -C ../../netwerk/locales/ libs AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C ../../dom/locales/ libs AB_CD=$* XPI_NAME=locale-$*

toolkit/locales/jar.mn

@@ -74,8 +74,6 @@
   locale/@AB_CD@/global/webapps.properties              (%chrome/global/webapps.properties)
   locale/@AB_CD@/global/wizard.dtd                      (%chrome/global/wizard.dtd)
   locale/@AB_CD@/global/wizard.properties               (%chrome/global/wizard.properties)
-  locale/@AB_CD@/global/crashes.dtd                     (%crashreporter/crashes.dtd)
-  locale/@AB_CD@/global/crashes.properties              (%crashreporter/crashes.properties)
 % locale global-region @AB_CD@ %locale/@AB_CD@/global-region/
   locale/@AB_CD@/global-region/region.properties        (%chrome/global-region/region.properties)
 % locale global-platform @AB_CD@ %locale/@AB_CD@/global-platform/

toolkit/mozapps/installer/l10n-repack.py

@@ -14,7 +14,6 @@ import buildconfig
 # Set of files or directories not listed in a chrome.manifest but that are
 # localized.
 NON_CHROME = set([
-    '**/crashreporter*.ini',
     'searchplugins',
     'dictionaries',
     'hyphenation',

toolkit/mozapps/installer/package-name.mk

@@ -122,8 +122,8 @@ PKG_SRCPACK_PATH = source/
 endif # MOZ_PKG_PRETTYNAMES
 
 # Symbol package naming
-SYMBOL_FULL_ARCHIVE_BASENAME = $(PKG_BASENAME).crashreporter-symbols-full
-SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME).crashreporter-symbols
+SYMBOL_FULL_ARCHIVE_BASENAME = $(PKG_BASENAME).crash-symbols-full
+SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME).crash-symbols
 
 # Code coverage package naming
 CODE_COVERAGE_ARCHIVE_BASENAME = $(PKG_BASENAME).code-coverage-gcno

toolkit/xre/moz.build

@@ -153,7 +153,6 @@ LOCAL_INCLUDES += [
     '/dom/base',
     '/dom/ipc',
     '/testing/gtest/mozilla',
-    '/toolkit/crashreporter',
     '/xpcom/build',
 ]
 

toolkit/xre/nsAndroidStartup.cpp

@@ -17,7 +17,6 @@
 #include "nsAppRunner.h"
 #include "AndroidBridge.h"
 #include "APKOpen.h"
-#include "nsExceptionHandler.h"
 
 #define LOG(args...) __android_log_print(ANDROID_LOG_INFO, MOZ_APP_NAME, args)
 

toolkit/xre/nsEmbedFunctions.cpp

@@ -35,7 +35,6 @@
 #include "nsAppRunner.h"
 #include "nsAutoRef.h"
 #include "nsDirectoryServiceDefs.h"
-#include "nsExceptionHandler.h"
 #include "nsString.h"
 #include "nsThreadUtils.h"
 #include "nsJSUtils.h"

toolkit/xre/nsX11ErrorHandler.cpp

@@ -7,7 +7,6 @@
 
 #include "prenv.h"
 #include "nsXULAppAPI.h"
-#include "nsExceptionHandler.h"
 #include "nsDebug.h"
 
 #include "mozilla/X11Util.h"

toolkit/xre/test/win/TestDllInterceptor.cpp

@@ -150,8 +150,6 @@ int main()
       TestHook("ntdll.dll", "NtWriteFile") &&
       TestHook("ntdll.dll", "NtWriteFileGather") &&
       TestHook("ntdll.dll", "NtQueryFullAttributesFile") &&
-      // Bug 733892: toolkit/crashreporter/nsExceptionHandler.cpp
-      TestHook("kernel32.dll", "SetUnhandledExceptionFilter") &&
 #ifdef _M_IX86
       // Bug 670967: xpcom/base/AvailableMemoryTracker.cpp
       TestHook("kernel32.dll", "VirtualAlloc") &&

tools/profiler/moz.build

@@ -86,16 +86,9 @@ if CONFIG['MOZ_ENABLE_PROFILER_SPS']:
         '/docshell/base',
         '/ipc/chromium/src',
         '/mozglue/linker',
-        '/toolkit/crashreporter/google-breakpad/src',
         '/xpcom/base',
     ]
 
-    # We need access to Breakpad's getcontext(3) which is suitable for Android
-    if CONFIG['OS_TARGET'] == 'Android':
-        LOCAL_INCLUDES += [
-            '/toolkit/crashreporter/google-breakpad/src/common/android/include',
-        ]
-
     if CONFIG['ANDROID_CPU_ARCH'] == 'armeabi':
         DEFINES['ARCH_ARMV6'] = True
 

xpcom/threads/moz.build

@@ -55,7 +55,6 @@ MSVC_ENABLE_PGO = True
 LOCAL_INCLUDES += [
     '../build',
     '/caps',
-    '/toolkit/crashreporter/google-breakpad/src',
     '/tools/profiler',
 ]
 

xulrunner/config/mozconfigs/linux32/xulrunner-qt

@@ -13,6 +13,5 @@ ac_add_options --disable-tests
 export PKG_CONFIG_PATH=/tools/qt-4.6.3/qt/lib/pkgconfig
 ac_add_options --with-qtdir=/tools/qt-4.6.3/qt
 ac_add_options --enable-default-toolkit=cairo-qt
-ac_add_options --disable-crashreporter
 
 . "$topsrcdir/xulrunner/config/mozconfigs/common.override"