Bug 1752646 - Merge Idle and non-Idle markers for CCSlice and ForgetSkippable r=jonco

Differential Revision: https://phabricator.services.mozilla.com/D137356

dom/base/nsJSEnvironment.cpp

@@ -1098,9 +1098,8 @@ static void FinishAnyIncrementalGC() {
 }
 
 static void FireForgetSkippable(bool aRemoveChildless, TimeStamp aDeadline) {
-  AUTO_PROFILER_TRACING_MARKER(
-      "CC", aDeadline.IsNull() ? "ForgetSkippable" : "IdleForgetSkippable",
-      GCCC);
+  AUTO_PROFILER_MARKER_TEXT("ForgetSkippable", GCCC, {},
+                            aDeadline.IsNull() ? ""_ns : "(idle)"_ns);
   TimeStamp startTimeStamp = TimeStamp::Now();
   FinishAnyIncrementalGC();
 
@@ -1413,8 +1412,8 @@ void nsJSContext::RunCycleCollectorSlice(CCReason aReason,
     return;
   }
 
-  AUTO_PROFILER_TRACING_MARKER(
-      "CC", aDeadline.IsNull() ? "CCSlice" : "IdleCCSlice", GCCC);
+  AUTO_PROFILER_MARKER_TEXT("CCSlice", GCCC, {},
+                            aDeadline.IsNull() ? ""_ns : "(idle)"_ns);
 
   AUTO_PROFILER_LABEL("nsJSContext::RunCycleCollectorSlice", GCCC);