Revert 62644 - During shutdown delete any pending tasks if running under Heapchecker.
BUG=50345
TEST=Suppression no longer gets used.
Review URL: http://codereview.chromium.org/3791006
TBR=thestig@chromium.org
Review URL: http://codereview.chromium.org/3779008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62695 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: bc09770f5dd4c019574af3bfd8c150f685660003
diff --git a/base/message_loop.cc b/base/message_loop.cc
index af1032c..8f6c997 100644
--- a/base/message_loop.cc
+++ b/base/message_loop.cc
@@ -470,7 +470,7 @@
// 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) || defined(USE_HEAPCHECKER)
+#if defined(PURIFY)
delete pending_task.task;
#elif defined(OS_POSIX)
if (RUNNING_ON_VALGRIND)
@@ -483,7 +483,7 @@
// 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) || defined(USE_HEAPCHECKER)
+#if defined(PURIFY)
task = deferred_non_nestable_work_queue_.front().task;
#elif defined(OS_POSIX)
if (RUNNING_ON_VALGRIND)