Bug 1903098 (MOZ) - reflect upstream 5b643294af changes in GeckoTraceEvent.h r=ng

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

tools/profiler/public/GeckoTraceEvent.h

@@ -325,13 +325,14 @@ static constexpr uint8_t TRACE_EVENT_SCOPE_THREAD = 2u << 2;
 // ASYNC_BEGIN event above. The `step` param identifies this step within the
 // async event. This should be called at the beginning of the next phase of an
 // asynchronous operation.
-#define TRACE_EVENT_ASYNC_STEP0(category, name, id, step)                   \
+#define TRACE_EVENT_ASYNC_STEP_INTO0(category, name, id, step)              \
   INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP, category,  \
                                    name, id, TRACE_EVENT_FLAG_NONE, "step", \
                                    step)
-#define TRACE_EVENT_ASYNC_STEP1(category, name, id, step, arg1_name, arg1_val) \
-  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP, category,     \
-                                   name, id, TRACE_EVENT_FLAG_NONE, "step",    \
+#define TRACE_EVENT_ASYNC_STEP_INTO1(category, name, id, step, arg1_name,   \
+                                     arg1_val)                              \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP, category,  \
+                                   name, id, TRACE_EVENT_FLAG_NONE, "step", \
                                    step, arg1_name, arg1_val)
 
 // Records a single ASYNC_END event for "name" immediately. If the category
@@ -797,8 +798,9 @@ class TraceEndOnScopeClose {
                                  arg2_name, arg2_val)                     \
   RTC_NOOP()
 
-#define TRACE_EVENT_ASYNC_STEP0(category, name, id, step) RTC_NOOP()
-#define TRACE_EVENT_ASYNC_STEP1(category, name, id, step, arg1_name, arg1_val) \
+#define TRACE_EVENT_ASYNC_STEP_INTO0(category, name, id, step) RTC_NOOP()
+#define TRACE_EVENT_ASYNC_STEP_INTO1(category, name, id, step, arg1_name, \
+                                     arg1_val)                            \
   RTC_NOOP()
 
 #define TRACE_EVENT_ASYNC_END0(category, name, id) RTC_NOOP()