1 files changed, 3 insertions, 32 deletions
diff --git a/toolkit/crashreporter/nsExceptionHandler.cpp b/toolkit/crashreporter/nsExceptionHandler.cpp
index 0d1286bdc..4d0b8cdfe 100644
--- a/toolkit/crashreporter/nsExceptionHandler.cpp
+++ b/toolkit/crashreporter/nsExceptionHandler.cpp
@@ -10,8 +10,6 @@
 #include "nsDirectoryServiceDefs.h"
 #include "nsDataHashtable.h"
 #include "mozilla/ArrayUtils.h"
-#include "mozilla/dom/CrashReporterChild.h"
-#include "mozilla/ipc/CrashReporterClient.h"
 #include "mozilla/Services.h"
 #include "nsIObserverService.h"
 #include "mozilla/Unused.h"
@@ -115,9 +113,6 @@ using google_breakpad::FileID;
 using google_breakpad::PageAllocator;
 #endif
 using namespace mozilla;
-using mozilla::dom::CrashReporterChild;
-using mozilla::dom::PCrashReporterChild;
-using mozilla::ipc::CrashReporterClient;
 
 namespace CrashReporter {
 
@@ -2233,13 +2228,7 @@ nsresult AnnotateCrashReport(const nsACString& key, const nsACString& data)
     return rv;
 
   if (!XRE_IsParentProcess()) {
-    // The newer CrashReporterClient can be used from any thread.
-    if (RefPtr<CrashReporterClient> client = CrashReporterClient::GetSingleton()) {
-      client->AnnotateCrashReport(nsCString(key), escapedData);
-      return NS_OK;
-    }
-
-    // Otherwise, we have to handle this on the main thread since we will go
+    // We have to handle this on the main thread since we will go
     // through IPDL.
     if (!NS_IsMainThread()) {
       // Child process needs to handle this in the main thread:
@@ -2249,13 +2238,7 @@ nsresult AnnotateCrashReport(const nsACString& key, const nsACString& data)
     }
 
     MOZ_ASSERT(NS_IsMainThread());
-    PCrashReporterChild* reporter = CrashReporterChild::GetCrashReporter();
-    if (!reporter) {
-      EnqueueDelayedNote(new DelayedNote(key, data));
-      return NS_OK;
-    }
-    if (!reporter->SendAnnotateCrashReport(nsCString(key), escapedData))
-      return NS_ERROR_FAILURE;
+    EnqueueDelayedNote(new DelayedNote(key, data));
     return NS_OK;
   }
 
@@ -2321,11 +2304,6 @@ nsresult AppendAppNotesToCrashReport(const nsACString& data)
     if (NS_FAILED(rv))
       return rv;
 
-    if (RefPtr<CrashReporterClient> client = CrashReporterClient::GetSingleton()) {
-      client->AppendAppNotes(escapedData);
-      return NS_OK;
-    }
-
     if (!NS_IsMainThread()) {
       // Child process needs to handle this in the main thread:
       nsCOMPtr<nsIRunnable> r = new CrashReporterHelperRunnable(data);
@@ -2334,14 +2312,7 @@ nsresult AppendAppNotesToCrashReport(const nsACString& data)
     }
 
     MOZ_ASSERT(NS_IsMainThread());
-    PCrashReporterChild* reporter = CrashReporterChild::GetCrashReporter();
-    if (!reporter) {
-      EnqueueDelayedNote(new DelayedNote(data));
-      return NS_OK;
-    }
-
-    if (!reporter->SendAppendAppNotes(escapedData))
-      return NS_ERROR_FAILURE;
+    EnqueueDelayedNote(new DelayedNote(data));
     return NS_OK;
   }