Remove base conditional code for crash reporter and injector.

3 files changed, 1 insertions, 42 deletions

diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build
index 12e1748e9..5dba09a32 100644
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -79,9 +79,6 @@ if not CONFIG['MOZ_FENNEC']:
     if CONFIG['NS_PRINTING']:
         DIRS += ['printing']
 
-if CONFIG['MOZ_CRASHREPORTER']:
-    DIRS += ['crashes']
-
 if CONFIG['BUILD_CTYPES']:
     DIRS += ['ctypes']
 
diff --git a/toolkit/components/places/tests/cpp/places_test_harness_tail.h b/toolkit/components/places/tests/cpp/places_test_harness_tail.h
index 4bbd45ccb..9e57c3724 100644
--- a/toolkit/components/places/tests/cpp/places_test_harness_tail.h
+++ b/toolkit/components/places/tests/cpp/places_test_harness_tail.h
@@ -6,9 +6,6 @@
 
 #include "nsWidgetsCID.h"
 #include "nsIComponentRegistrar.h"
-#ifdef MOZ_CRASHREPORTER
-#include "nsICrashReporter.h"
-#endif
 
 #ifndef TEST_NAME
 #error "Must #define TEST_NAME before including places_test_harness_tail.h"
@@ -94,32 +91,6 @@ main(int aArgc,
     return -1;
   }
 
-#ifdef MOZ_CRASHREPORTER
-    char* enabled = PR_GetEnv("MOZ_CRASHREPORTER");
-    if (enabled && !strcmp(enabled, "1")) {
-      // bug 787458: move this to an even-more-common location to use in all
-      // C++ unittests
-      nsCOMPtr<nsICrashReporter> crashreporter =
-        do_GetService("@mozilla.org/toolkit/crash-reporter;1");
-      if (crashreporter) {
-        fprintf(stderr, "Setting up crash reporting\n");
-
-        nsCOMPtr<nsIProperties> dirsvc =
-          do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID);
-        if (!dirsvc)
-          NS_RUNTIMEABORT("Couldn't get directory service");
-        nsCOMPtr<nsIFile> cwd;
-        nsresult rv = dirsvc->Get(NS_OS_CURRENT_WORKING_DIR,
-                                  NS_GET_IID(nsIFile),
-                                  getter_AddRefs(cwd));
-        if (NS_FAILED(rv))
-          NS_RUNTIMEABORT("Couldn't get CWD");
-        crashreporter->SetEnabled(true);
-        crashreporter->SetMinidumpPath(cwd);
-      }
-    }
-#endif
-
   RefPtr<WaitForConnectionClosed> spinClose = new WaitForConnectionClosed();
 
   // Tinderboxes are constantly on idle.  Since idle tasks can interact with
diff --git a/toolkit/components/terminator/nsTerminator.cpp b/toolkit/components/terminator/nsTerminator.cpp
index f9459cc5d..91e872821 100644
--- a/toolkit/components/terminator/nsTerminator.cpp
+++ b/toolkit/components/terminator/nsTerminator.cpp
@@ -29,9 +29,6 @@
 
 #include "nsIObserverService.h"
 #include "nsIPrefService.h"
-#if defined(MOZ_CRASHREPORTER)
-#include "nsExceptionHandler.h"
-#endif
 
 #if defined(XP_WIN)
 #include <windows.h>
@@ -541,13 +538,7 @@ nsTerminator::UpdateTelemetry()
 void
 nsTerminator::UpdateCrashReport(const char* aTopic)
 {
-#if defined(MOZ_CRASHREPORTER)
-  // In case of crash, we wish to know where in shutdown we are
-  nsAutoCString report(aTopic);
-
-  Unused << CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("ShutdownProgress"),
-                                               report);
-#endif // defined(MOZ_CRASH_REPORTER)
+  /*** STUB ***/
 }