Update task tracking to not depend on message_loop_ singleton

base/message_loop.cc

Index: base/message_loop.cc
===================================================================
--- base/message_loop.cc	(revision 104925)
+++ base/message_loop.cc	(working copy)
@@ -476,23 +476,22 @@
   base::debug::Alias(&program_counter);
 
   HistogramEvent(kTaskRunEvent);
+
+  TimeTicks start_of_run = tracked_objects::ThreadData::Now();
   FOR_EACH_OBSERVER(TaskObserver, task_observers_,
                     WillProcessTask(pending_task.time_posted));
   pending_task.task.Run();
   FOR_EACH_OBSERVER(TaskObserver, task_observers_,
                     DidProcessTask(pending_task.time_posted));
+  tracked_objects::ThreadData::TallyADeathIfActive(pending_task.post_births,
+                                                   pending_task.time_posted,
+                                                   start_of_run,
+                                                   this);
 
-#if defined(TRACK_ALL_TASK_OBJECTS)
-  tracked_objects::ThreadData::TallyADeathIfActive(

[jar (doing other things), 2011/10/14 02:29:53]

I changed this code so that I don't need to ifdef it here.  In production, the
function will be a no-op, and will be compiled out.

-      pending_task.post_births,
-      TimeTicks::Now() - pending_task.time_posted);
-#endif  // defined(TRACK_ALL_TASK_OBJECTS)
-
   nestable_tasks_allowed_ = true;
 }
 
-bool MessageLoop::DeferOrRunPendingTask(
-    const PendingTask& pending_task) {
+bool MessageLoop::DeferOrRunPendingTask(const PendingTask& pending_task) {
   if (pending_task.nestable || state_->run_depth == 1) {
     RunTask(pending_task);
     // Show that we ran a task (Note: a new one might arrive as a