From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:14:29 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 xpcom/base/AppShutdown.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'xpcom/base/AppShutdown.cpp')

diff --git a/xpcom/base/AppShutdown.cpp b/xpcom/base/AppShutdown.cpp
index c68dedef31..53ae4e3ba9 100644
--- a/xpcom/base/AppShutdown.cpp
+++ b/xpcom/base/AppShutdown.cpp
@@ -309,32 +309,32 @@ bool AppShutdown::IsRestarting() {
 
 void AppShutdown::AnnotateShutdownReason(AppShutdownReason aReason) {
   auto key = CrashReporter::Annotation::ShutdownReason;
-  nsCString reasonStr;
+  const char* reasonStr;
   switch (aReason) {
     case AppShutdownReason::AppClose:
-      reasonStr = "AppClose"_ns;
+      reasonStr = "AppClose";
       break;
     case AppShutdownReason::AppRestart:
-      reasonStr = "AppRestart"_ns;
+      reasonStr = "AppRestart";
       break;
     case AppShutdownReason::OSForceClose:
-      reasonStr = "OSForceClose"_ns;
+      reasonStr = "OSForceClose";
       break;
     case AppShutdownReason::OSSessionEnd:
-      reasonStr = "OSSessionEnd"_ns;
+      reasonStr = "OSSessionEnd";
       break;
     case AppShutdownReason::OSShutdown:
-      reasonStr = "OSShutdown"_ns;
+      reasonStr = "OSShutdown";
       break;
     case AppShutdownReason::WinUnexpectedMozQuit:
-      reasonStr = "WinUnexpectedMozQuit"_ns;
+      reasonStr = "WinUnexpectedMozQuit";
       break;
     default:
       MOZ_ASSERT_UNREACHABLE("We should know the given reason for shutdown.");
-      reasonStr = "Unknown"_ns;
+      reasonStr = "Unknown";
       break;
   }
-  CrashReporter::AnnotateCrashReport(key, reasonStr);
+  CrashReporter::RecordAnnotationCString(key, reasonStr);
 }
 
 #ifdef DEBUG
-- 
cgit v1.2.3