Revert 107793 - Fully enable about:tracking by default

base/message_loop.cc

Index: base/message_loop.cc
===================================================================
--- base/message_loop.cc	(revision 107798)
+++ base/message_loop.cc	(working copy)
@@ -486,17 +486,21 @@
 
   HistogramEvent(kTaskRunEvent);
 
-  tracked_objects::TrackedTime start_time = tracked_objects::ThreadData::Now();
+#if defined(TRACK_ALL_TASK_OBJECTS)
+  TimeTicks start_of_run = tracked_objects::ThreadData::Now();
+#endif  // defined(TRACK_ALL_TASK_OBJECTS)
 
   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));
+#if defined(TRACK_ALL_TASK_OBJECTS)
+  tracked_objects::ThreadData::TallyADeathIfActive(pending_task.post_births,
+      pending_task.time_posted, pending_task.delayed_run_time, start_of_run,
+      tracked_objects::ThreadData::Now());
+#endif  // defined(TRACK_ALL_TASK_OBJECTS)
 
-  tracked_objects::ThreadData::TallyRunOnNamedThreadIfTracking(pending_task,
-      start_time, tracked_objects::ThreadData::Now());
-
   nestable_tasks_allowed_ = true;
 }
 
@@ -768,31 +772,22 @@
 }
 
 //------------------------------------------------------------------------------
-// MessageLoop::TrackingInfo
-
-MessageLoop::TrackingInfo::TrackingInfo(
-    const tracked_objects::Location& posted_from,
-    base::TimeTicks delayed_run_time)
-    : birth_tally(
-          tracked_objects::ThreadData::TallyABirthIfActive(posted_from)),
-      time_posted(TimeTicks::Now()),
-      delayed_run_time(delayed_run_time) {
-}
-
-MessageLoop::TrackingInfo::~TrackingInfo() {}
-
-//------------------------------------------------------------------------------
 // MessageLoop::PendingTask
+
 MessageLoop::PendingTask::PendingTask(
     const base::Closure& task,
     const tracked_objects::Location& posted_from,
     TimeTicks delayed_run_time,
     bool nestable)
-    : TrackingInfo(posted_from, delayed_run_time),
-      task(task),
+    : task(task),
+      time_posted(TimeTicks::Now()),
+      delayed_run_time(delayed_run_time),
       posted_from(posted_from),
       sequence_num(0),
       nestable(nestable) {
+#if defined(TRACK_ALL_TASK_OBJECTS)
+  post_births = tracked_objects::ThreadData::TallyABirthIfActive(posted_from);
+#endif  // defined(TRACK_ALL_TASK_OBJECTS)
 }
 
 MessageLoop::PendingTask::~PendingTask() {