Adding upstream version 125.0.1.upstream/125.0.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 15 insertions, 14 deletions

diff --git a/tools/profiler/gecko/ChildProfilerController.cpp b/tools/profiler/gecko/ChildProfilerController.cpp
index f51cb9437d..864e45f683 100644
--- a/tools/profiler/gecko/ChildProfilerController.cpp
+++ b/tools/profiler/gecko/ChildProfilerController.cpp
@@ -77,9 +77,9 @@ void ChildProfilerController::ShutdownAndMaybeGrabShutdownProfileFirst(
   }
   if (profilerChildThread) {
     if (profiler_is_active()) {
-      CrashReporter::AnnotateCrashReport(
+      CrashReporter::RecordAnnotationCString(
           CrashReporter::Annotation::ProfilerChildShutdownPhase,
-          "Profiling - Dispatching ShutdownProfilerChild"_ns);
+          "Profiling - Dispatching ShutdownProfilerChild");
       profilerChildThread->Dispatch(
           NewRunnableMethod<ProfileAndAdditionalInformation*>(
               "ChildProfilerController::ShutdownProfilerChild", this,
@@ -90,9 +90,9 @@ void ChildProfilerController::ShutdownAndMaybeGrabShutdownProfileFirst(
       // (including the ShutdownProfilerChild runnable) have been processed.
       profilerChildThread->Shutdown();
     } else {
-      CrashReporter::AnnotateCrashReport(
+      CrashReporter::RecordAnnotationCString(
           CrashReporter::Annotation::ProfilerChildShutdownPhase,
-          "Not profiling - Running ShutdownProfilerChild"_ns);
+          "Not profiling - Running ShutdownProfilerChild");
       // If we're not profiling, this operation will be very quick, so it can be
       // done synchronously. This avoids having to manually shutdown the thread,
       // which runs a risky inner event loop, see bug 1613798.
@@ -148,23 +148,24 @@ void ChildProfilerController::ShutdownProfilerChild(
     ProfileAndAdditionalInformation* aOutShutdownProfileInformation) {
   const bool isProfiling = profiler_is_active();
   if (aOutShutdownProfileInformation) {
-    CrashReporter::AnnotateCrashReport(
+    CrashReporter::RecordAnnotationCString(
         CrashReporter::Annotation::ProfilerChildShutdownPhase,
-        isProfiling ? "Profiling - GrabShutdownProfile"_ns
-                    : "Not profiling - GrabShutdownProfile"_ns);
+        isProfiling ? "Profiling - GrabShutdownProfile"
+                    : "Not profiling - GrabShutdownProfile");
     *aOutShutdownProfileInformation = mProfilerChild->GrabShutdownProfile();
   }
-  CrashReporter::AnnotateCrashReport(
+  CrashReporter::RecordAnnotationCString(
       CrashReporter::Annotation::ProfilerChildShutdownPhase,
-      isProfiling ? "Profiling - Destroying ProfilerChild"_ns
-                  : "Not profiling - Destroying ProfilerChild"_ns);
+      isProfiling ? "Profiling - Destroying ProfilerChild"
+                  : "Not profiling - Destroying ProfilerChild");
   mProfilerChild->Destroy();
   mProfilerChild = nullptr;
-  CrashReporter::AnnotateCrashReport(
+  CrashReporter::RecordAnnotationCString(
       CrashReporter::Annotation::ProfilerChildShutdownPhase,
-      isProfiling
-          ? "Profiling - ShutdownProfilerChild complete, waiting for thread shutdown"_ns
-          : "Not Profiling - ShutdownProfilerChild complete, waiting for thread shutdown"_ns);
+      isProfiling ? "Profiling - ShutdownProfilerChild complete, waiting for "
+                    "thread shutdown"
+                  : "Not Profiling - ShutdownProfilerChild complete, waiting "
+                    "for thread shutdown");
 }
 
 }  // namespace mozilla