From 612459488e5810335c493c467c239c40787cc1d3 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Tue, 22 May 2018 19:19:56 +0200 Subject: Remove IPC CrashReporterClient/Host Tag #20. --- toolkit/crashreporter/nsExceptionHandler.cpp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'toolkit') diff --git a/toolkit/crashreporter/nsExceptionHandler.cpp b/toolkit/crashreporter/nsExceptionHandler.cpp index b6237a7a4..4d0b8cdfe 100644 --- a/toolkit/crashreporter/nsExceptionHandler.cpp +++ b/toolkit/crashreporter/nsExceptionHandler.cpp @@ -10,7 +10,6 @@ #include "nsDirectoryServiceDefs.h" #include "nsDataHashtable.h" #include "mozilla/ArrayUtils.h" -#include "mozilla/ipc/CrashReporterClient.h" #include "mozilla/Services.h" #include "nsIObserverService.h" #include "mozilla/Unused.h" @@ -114,8 +113,6 @@ using google_breakpad::FileID; using google_breakpad::PageAllocator; #endif using namespace mozilla; -using mozilla::dom::CrashReporterChild; -using mozilla::ipc::CrashReporterClient; namespace CrashReporter { @@ -2231,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 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: @@ -2313,11 +2304,6 @@ nsresult AppendAppNotesToCrashReport(const nsACString& data) if (NS_FAILED(rv)) return rv; - if (RefPtr client = CrashReporterClient::GetSingleton()) { - client->AppendAppNotes(escapedData); - return NS_OK; - } - if (!NS_IsMainThread()) { // Child process needs to handle this in the main thread: nsCOMPtr r = new CrashReporterHelperRunnable(data); -- cgit v1.2.3