Use TRACK_RUN_IN_THIS_SCOPED_REGION for heap profiler

base/profiler/scoped_profile.h

Index: base/profiler/scoped_profile.h
diff --git a/base/profiler/scoped_profile.h b/base/profiler/scoped_profile.h
index 657150a0f18dce184cd814dfa08eea8af7c439bc..fd6d056cfe95bbfc55f914880fbd16a8ec3323a1 100644
--- a/base/profiler/scoped_profile.h
+++ b/base/profiler/scoped_profile.h
@@ -16,6 +16,7 @@
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/profiler/tracked_time.h"
+#include "base/trace_event/heap_profiler.h"
 #include "base/tracked_objects.h"
 
 #define PASTE_LINE_NUMBER_ON_NAME(name, line) name##line
@@ -23,21 +24,30 @@
 #define LINE_BASED_VARIABLE_NAME_FOR_PROFILING                                 \
     PASTE_LINE_NUMBER_ON_NAME(some_profiler_variable_, __LINE__)
 
+#define LINE_BASED_VARIABLE_NAME_FOR_HEAP_PROFILING \

[dcheng, 2017/02/15 08:12:44]

Do we need a new macro for this? Seems like the one on line 24 should work, as
long as the macro doesn't actually appear twice on the same line.

[ssid, 2017/02/15 18:59:47]

Um, I can't use the same macro twice in TRACK_RUN_IN_THIS_SCOPED_REGION. The
code in the macro gets defined in the same line, even if it looks as multiple
line in the definition.

[dcheng, 2017/02/15 19:14:25]

Can we use __COUNTER__ to get around that problem?

[ssid, 2017/02/15 19:35:53]

I replaced with __COUNTER__ and then realized that the LINE was already not
working. It was just substituting name as variable__LINE__. It needs two level
indirection like the case of 
https://cs.chromium.org/chromium/src/base/trace_event/trace_event.h?rcl=064a2...

So replaced and used counter.

+  PASTE_LINE_NUMBER_ON_NAME(heap_profiler_variable_, __LINE__)
+
 // Defines the containing scope as a profiled region. This allows developers to
 // profile their code and see results on their about:profiler page, as well as
-// on the UMA dashboard.
+// on the UMA dashboard and heap profiler.
 #define TRACK_RUN_IN_THIS_SCOPED_REGION(dispatch_function_name)            \
+  const ::tracked_objects::Location& location =                            \
+      FROM_HERE_WITH_EXPLICIT_FUNCTION(#dispatch_function_name);           \
+  TRACE_HEAP_PROFILER_API_SCOPED_TASK_EXECUTION                            \
+  LINE_BASED_VARIABLE_NAME_FOR_HEAP_PROFILING(location.file_name());       \
   ::tracked_objects::ScopedProfile LINE_BASED_VARIABLE_NAME_FOR_PROFILING( \
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(#dispatch_function_name),           \
-      ::tracked_objects::ScopedProfile::ENABLED)
+      location, ::tracked_objects::ScopedProfile::ENABLED)
 
 // Same as TRACK_RUN_IN_THIS_SCOPED_REGION except that there's an extra param
 // which is concatenated with the function name for better filtering.
 #define TRACK_SCOPED_REGION(category_name, dispatch_function_name)         \
+  const ::tracked_objects::Location& location =                            \
+      FROM_HERE_WITH_EXPLICIT_FUNCTION("[" category_name                   \
+                                       "]" dispatch_function_name);        \
+  TRACE_HEAP_PROFILER_API_SCOPED_TASK_EXECUTION                            \
+  LINE_BASED_VARIABLE_NAME_FOR_HEAP_PROFILING(location.file_name());       \
   ::tracked_objects::ScopedProfile LINE_BASED_VARIABLE_NAME_FOR_PROFILING( \
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(                                    \
-          "[" category_name "]" dispatch_function_name),                   \
-      ::tracked_objects::ScopedProfile::ENABLED)
+      location, ::tracked_objects::ScopedProfile::ENABLED)
 
 namespace tracked_objects {
 class Births;