Remove base conditional code for crash reporter and injector.

1 files changed, 0 insertions, 103 deletions

diff --git a/ipc/glue/CrashReporterHost.cpp b/ipc/glue/CrashReporterHost.cpp
index 76052ae66..85552cba5 100644
--- a/ipc/glue/CrashReporterHost.cpp
+++ b/ipc/glue/CrashReporterHost.cpp
@@ -9,9 +9,6 @@
 #include "mozilla/Sprintf.h"
 #include "mozilla/SyncRunnable.h"
 #include "mozilla/Telemetry.h"
-#ifdef MOZ_CRASHREPORTER
-# include "nsICrashService.h"
-#endif
 
 namespace mozilla {
 namespace ipc {
@@ -24,105 +21,5 @@ CrashReporterHost::CrashReporterHost(GeckoProcessType aProcessType,
 {
 }
 
-#ifdef MOZ_CRASHREPORTER
-void
-CrashReporterHost::GenerateCrashReport(RefPtr<nsIFile> aCrashDump)
-{
-  nsString dumpID;
-  if (!CrashReporter::GetIDFromMinidump(aCrashDump, dumpID)) {
-    return;
-  }
-
-  CrashReporter::AnnotationTable notes;
-
-  nsAutoCString type;
-  switch (mProcessType) {
-    case GeckoProcessType_Content:
-      type = NS_LITERAL_CSTRING("content");
-      break;
-    case GeckoProcessType_Plugin:
-    case GeckoProcessType_GMPlugin:
-      type = NS_LITERAL_CSTRING("plugin");
-      break;
-    case GeckoProcessType_GPU:
-      type = NS_LITERAL_CSTRING("gpu");
-      break;
-    default:
-      NS_ERROR("unknown process type");
-      break;
-  }
-  notes.Put(NS_LITERAL_CSTRING("ProcessType"), type);
-
-  char startTime[32];
-  SprintfLiteral(startTime, "%lld", static_cast<long long>(mStartTime));
-  notes.Put(NS_LITERAL_CSTRING("StartupTime"), nsDependentCString(startTime));
-
-  CrashReporterMetadataShmem::ReadAppNotes(mShmem, &notes);
-
-  CrashReporter::AppendExtraData(dumpID, notes);
-  NotifyCrashService(mProcessType, dumpID, &notes);
-}
-
-/* static */ void
-CrashReporterHost::NotifyCrashService(GeckoProcessType aProcessType,
-                                      const nsString& aChildDumpID,
-                                      const AnnotationTable* aNotes)
-{
-  if (!NS_IsMainThread()) {
-    RefPtr<Runnable> runnable = NS_NewRunnableFunction([=] () -> void {
-      CrashReporterHost::NotifyCrashService(aProcessType, aChildDumpID, aNotes);
-    });
-    RefPtr<nsIThread> mainThread = do_GetMainThread();
-    SyncRunnable::DispatchToThread(mainThread, runnable);
-    return;
-  }
-
-  MOZ_ASSERT(!aChildDumpID.IsEmpty());
-
-  nsCOMPtr<nsICrashService> crashService =
-    do_GetService("@mozilla.org/crashservice;1");
-  if (!crashService) {
-    return;
-  }
-
-  int32_t processType;
-  int32_t crashType = nsICrashService::CRASH_TYPE_CRASH;
-
-  nsCString telemetryKey;
-
-  switch (aProcessType) {
-    case GeckoProcessType_Content:
-      processType = nsICrashService::PROCESS_TYPE_CONTENT;
-      telemetryKey.AssignLiteral("content");
-      break;
-    case GeckoProcessType_Plugin: {
-      processType = nsICrashService::PROCESS_TYPE_PLUGIN;
-      telemetryKey.AssignLiteral("plugin");
-      nsAutoCString val;
-      if (aNotes->Get(NS_LITERAL_CSTRING("PluginHang"), &val) &&
-        val.Equals(NS_LITERAL_CSTRING("1"))) {
-        crashType = nsICrashService::CRASH_TYPE_HANG;
-        telemetryKey.AssignLiteral("pluginhang");
-      }
-      break;
-    }
-    case GeckoProcessType_GMPlugin:
-      processType = nsICrashService::PROCESS_TYPE_GMPLUGIN;
-      telemetryKey.AssignLiteral("gmplugin");
-      break;
-    case GeckoProcessType_GPU:
-      processType = nsICrashService::PROCESS_TYPE_GPU;
-      telemetryKey.AssignLiteral("gpu");
-      break;
-    default:
-      NS_ERROR("unknown process type");
-      return;
-  }
-
-  crashService->AddCrash(processType, crashType, aChildDumpID);
-  Telemetry::Accumulate(Telemetry::SUBPROCESS_CRASHES_WITH_DUMP, telemetryKey, 1);
-}
-#endif
-
 } // namespace ipc
 } // namespace mozilla