Delete tasks unconditionally in MessageLoop::DeletePendingTasks().

base/message_loop.cc

Index: base/message_loop.cc
diff --git a/base/message_loop.cc b/base/message_loop.cc
index 1d86f79d4d1a9f912d94fa093655d0c6c4f87618..d67e64ad76b586077eb953883b459d64ab06f90b 100644
--- a/base/message_loop.cc
+++ b/base/message_loop.cc
@@ -466,37 +466,18 @@ bool MessageLoop::DeletePendingTasks() {
       // tasks.
       AddToDelayedWorkQueue(pending_task);
     } else {
-      // TODO(darin): Delete all tasks once it is safe to do so.
-      // Until it is totally safe, just do it when running Purify or
-      // Valgrind.
-#if defined(PURIFY)
       delete pending_task.task;
-#elif defined(OS_POSIX)
-      if (RUNNING_ON_VALGRIND)
-        delete pending_task.task;
-#endif  // defined(OS_POSIX)
     }
   }
   did_work |= !deferred_non_nestable_work_queue_.empty();
   while (!deferred_non_nestable_work_queue_.empty()) {
-    // TODO(darin): Delete all tasks once it is safe to do so.
-    // Until it is totaly safe, only delete them under Purify and Valgrind.
-    Task* task = NULL;
-#if defined(PURIFY)
-    task = deferred_non_nestable_work_queue_.front().task;
-#elif defined(OS_POSIX)
-    if (RUNNING_ON_VALGRIND)
-      task = deferred_non_nestable_work_queue_.front().task;
-#endif
+    delete deferred_non_nestable_work_queue_.front().task;
     deferred_non_nestable_work_queue_.pop();
-    if (task)
-      delete task;
   }
   did_work |= !delayed_work_queue_.empty();
   while (!delayed_work_queue_.empty()) {
-    Task* task = delayed_work_queue_.top().task;
+    delete delayed_work_queue_.top().task;

[jar (doing other things), 2010/08/03 02:40:35]

A task deletion may have a side effect, which may push a new task onto a queue. 
As a result, you have to remove it from the queue before calling for the
deletion.  This was all carefully done in the existing code, and you should try
to maintain that format (removing only the ifdefs.

     delayed_work_queue_.pop();
-    delete task;
   }
   return did_work;
 }