Eliminate the TimerManager by pulling its priority queue into MessageLoop. This CL also eliminates TaskBase by creating a simple PendingTask struct that is allocated inline within a std::queue used to implement the queues in the MessageLoop class.

R=jar

Review URL: http://codereview.chromium.org/483

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1825 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 6 deletions

diff --git a/base/tracked_objects_unittest.cc b/base/tracked_objects_unittest.cc
index 4fececd..29827fc 100644
--- a/base/tracked_objects_unittest.cc
+++ b/base/tracked_objects_unittest.cc
@@ -51,17 +51,15 @@ TEST_F(TrackedObjectsTest, MinimalStartupShutdown) {
   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 @@ TEST_F(TrackedObjectsTest, TinyStartupShutdown) {
 
 
   // Now instigate a birth, and a death.
-  delete new NoopTask;
+  delete new NoopTracked;
 
   birth_map.clear();
   data->SnapshotBirthMap(&birth_map);