Extract trace from TaskAnnotator::RunTask to its call sites

components/timers/alarm_timer_chromeos.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/timers/alarm_timer_chromeos.h"
 
 #include <sys/timerfd.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 410 matching lines @@
   // Take ownership of the pending user task, which is going to be cleared by
   // the Stop() or Reset() functions below.
   scoped_ptr<base::PendingTask> pending_user_task(pending_task_.Pass());
 
   // Re-schedule or stop the timer as requested.
   if (base::Timer::is_repeating())
     Reset();
   else
     Stop();
 
+  TRACE_EVENT_WITH_MEMORY_TAG2(

[danakj, 2015/07/15 18:03:23]

You want to cover the time in this function right? That's the point of moving
it? Why doesn't this trace cover the things this function is doing above then?

+      "toplevel",
+      "AlarmTimer::OnTimerFired",
+      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());
+
   // Now run the user task.
   base::MessageLoop::current()->task_annotator()->RunTask(
-      "AlarmTimer::Reset", "AlarmTimer::OnTimerFired", *pending_user_task);
+      "AlarmTimer::Reset", *pending_user_task);
 }
 
 OneShotAlarmTimer::OneShotAlarmTimer() : AlarmTimer(false, false) {
 }
 
 OneShotAlarmTimer::~OneShotAlarmTimer() {
 }
 
 RepeatingAlarmTimer::RepeatingAlarmTimer() : AlarmTimer(true, true) {
 }
@@ skipping 14 matching lines @@
 SimpleAlarmTimer::SimpleAlarmTimer(const tracked_objects::Location& posted_from,
                                    base::TimeDelta delay,
                                    const base::Closure& user_task)
     : AlarmTimer(posted_from, delay, user_task, false) {
 }
 
 SimpleAlarmTimer::~SimpleAlarmTimer() {
 }
 
 }  // namespace timers