Extract trace from TaskAnnotator::RunTask to its call sites

base/debug/task_annotator.cc

Index: base/debug/task_annotator.cc
diff --git a/base/debug/task_annotator.cc b/base/debug/task_annotator.cc
index 19df8cb39e5129b9c02987f919b8bdb7cc1d7760..b74d390938d75867af4f52d379774ae6fe265667 100644
--- a/base/debug/task_annotator.cc
+++ b/base/debug/task_annotator.cc
@@ -26,7 +26,6 @@ void TaskAnnotator::DidQueueTask(const char* queue_function,
 }
 
 void TaskAnnotator::RunTask(const char* queue_function,
-                            const char* run_function,
                             const PendingTask& pending_task) {
   tracked_objects::TaskStopwatch stopwatch;
   stopwatch.Start();
@@ -39,18 +38,6 @@ void TaskAnnotator::RunTask(const char* queue_function,
                         "queue_duration",
                         queue_duration.InMilliseconds());
 
-  // When tracing memory for posted tasks it's more valuable to attribute the

[Sami, 2015/07/15 17:44:00]

Drive-by: would it work if we split this into TRACE_EVENT_BEGIN and
TRACE_EVENT_END which could be called from different spots in the message loop
(and other call sites)? We could change the macros in trace_event.h if they
don't currently allow this.

[dsinclair, 2015/07/15 17:58:28]

You'd need to use an async event or something other then a regular event to do
that. Otherwise, we're going to think the slice is the total time between the
two points which isn't correct.

[Sami, 2015/07/15 18:06:52]

Hmm, I thought the idea here was to include those things in the duration of the
trace event, i.e., make it cover more of the execution? Or did I miss something?

-  // memory allocations to the source function than generically to the task
-  // runner.
-  TRACE_EVENT_WITH_MEMORY_TAG2(
-      "toplevel",
-      run_function,
-      pending_task.posted_from.function_name(),  // Name for memory tracking.
-      "src_file",
-      pending_task.posted_from.file_name(),
-      "src_func",
-      pending_task.posted_from.function_name());
-
   // Before running the task, store the program counter where it was posted
   // and deliberately alias it to ensure it is on the stack if the task
   // crashes. Be careful not to assume that the variable itself will have the