Remove base conditional code for crash reporter and injector.

1 files changed, 0 insertions, 19 deletions

diff --git a/gfx/src/DriverCrashGuard.cpp b/gfx/src/DriverCrashGuard.cpp
index 36d08dcf3..4754c26ad 100644
--- a/gfx/src/DriverCrashGuard.cpp
+++ b/gfx/src/DriverCrashGuard.cpp
@@ -7,9 +7,6 @@
 #include "gfxPrefs.h"

 #include "nsAppDirectoryServiceDefs.h"

 #include "nsDirectoryServiceUtils.h"

-#ifdef MOZ_CRASHREPORTER

-#include "nsExceptionHandler.h"

-#endif

 #include "nsServiceManagerUtils.h"

 #include "nsString.h"

 #include "nsXULAppAPI.h"

@@ -164,12 +161,6 @@ DriverCrashGuard::~DriverCrashGuard()
   } else {

     dom::ContentChild::GetSingleton()->SendEndDriverCrashGuard(uint32_t(mType));

   }

-

-#ifdef MOZ_CRASHREPORTER

-  // Remove the crash report annotation.

-  CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("GraphicsStartupTest"),

-                                     NS_LITERAL_CSTRING(""));

-#endif

 }

 

 bool

@@ -208,16 +199,6 @@ DriverCrashGuard::ActivateGuard()
 {

   mGuardActivated = true;

 

-#ifdef MOZ_CRASHREPORTER

-  // Anotate crash reports only if we're a real guard. Otherwise, we could

-  // attribute a random parent process crash to a graphics problem in a child

-  // process.

-  if (mMode != Mode::Proxy) {

-    CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("GraphicsStartupTest"),

-                                       NS_LITERAL_CSTRING("1"));

-  }

-#endif

-

   // If we're in the content process, the rest of the guarding is handled

   // in the parent.

   if (XRE_IsContentProcess()) {