Eliminate the TimerManager by pulling its priority queue into MessageLoop....

base/tracked_objects_unittest.cc

Index: base/tracked_objects_unittest.cc
===================================================================
--- base/tracked_objects_unittest.cc	(revision 1824)
+++ base/tracked_objects_unittest.cc	(working copy)
@@ -51,17 +51,15 @@
   ThreadData::ShutdownSingleThreadedCleanup();
 }
 
-class NoopTask : public Task {
- public:
-  void Run() {}
+class NoopTracked : public tracked_objects::Tracked {
 };
 
 TEST_F(TrackedObjectsTest, TinyStartupShutdown) {
   if (!ThreadData::StartTracking(true))
     return;
 
-  // Instigate tracking on a single task, or our thread.
-  NoopTask task;
+  // Instigate tracking on a single tracked object, or our thread.
+  NoopTracked tracked;
 
   const ThreadData* data = ThreadData::first();
   EXPECT_TRUE(data);
@@ -77,7 +75,7 @@
 
 
   // Now instigate a birth, and a death.
-  delete new NoopTask;
+  delete new NoopTracked;
 
   birth_map.clear();
   data->SnapshotBirthMap(&birth_map);