Add TRACE_COUNTER_WITH_TIMESTAMPx macros.

base/trace_event/common/trace_event_common.h

Index: base/trace_event/common/trace_event_common.h
diff --git a/base/trace_event/common/trace_event_common.h b/base/trace_event/common/trace_event_common.h
index 16a9a3762d4d48f3a82dd50d1234286d95ce4e58..9b4123db6d7332c794017167f8f0a6af9a590351 100644
--- a/base/trace_event/common/trace_event_common.h
+++ b/base/trace_event/common/trace_event_common.h
@@ -484,6 +484,20 @@
                            static_cast<int>(value1_val), value2_name,       \
                            static_cast<int>(value2_val))
 
+// Similar to TRACE_COUNTERx, but with a custom |timestamp| provided.
+#define TRACE_COUNTER_WITH_TIMESTAMP1(category_group, name, value, timestamp) \

[oystein (OOO til 10th of July), 2015/11/23 19:21:15]

nit: the timestamp value should be before the optional args here (value,
value1_val, value2_name, etc), to be consistent with the other macros.

[fdoray, 2015/11/25 21:13:12]

Done.

+  INTERNAL_TRACE_EVENT_ADD_WITH_TIMESTAMP(                                    \
+      TRACE_EVENT_PHASE_COUNTER, category_group, name, timestamp,             \
+      TRACE_EVENT_FLAG_NONE, "value", static_cast<int>(value))
+
+#define TRACE_COUNTER_WITH_TIMESTAMP2(category_group, name, value1_name,   \
+                                      value1_val, value2_name, value2_val, \
+                                      timestamp)                           \
+  INTERNAL_TRACE_EVENT_ADD_WITH_TIMESTAMP(                                 \
+      TRACE_EVENT_PHASE_COUNTER, category_group, name, timestamp,          \
+      TRACE_EVENT_FLAG_NONE, value1_name, static_cast<int>(value1_val),    \
+      value2_name, static_cast<int>(value2_val))
+
 // Records the value of a counter called "name" immediately. Value
 // must be representable as a 32 bit integer.
 // - category and name strings must have application lifetime (statics or