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"
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/pending_task.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
+#include "base/trace_event/trace_event.h"
 
 namespace timers {
 namespace {
 // This class represents the IO thread that the AlarmTimer::Delegate may use for
 // watching file descriptors if it gets called from a thread that does not have
 // a MessageLoopForIO.  It is a lazy global instance because it may not always
 // be necessary.
 class RtcAlarmIOThread : public base::Thread {
  public:
   RtcAlarmIOThread() : Thread("RTC Alarm IO Thread") {
@@ skipping 392 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_TASK_EXECUTION("AlarmTimer::OnTimerFired", *pending_user_task);
+
   // Now run the user task.
-  base::MessageLoop::current()->task_annotator()->RunTask(
-      "AlarmTimer::Reset", "AlarmTimer::OnTimerFired", *pending_user_task);
+  base::MessageLoop::current()->task_annotator()->RunTask("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