diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 20:03:42 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 20:03:42 +0000 |
| commit | f4681a92c958eb254b0c5ac479cf3906020a92a0 (patch) | |
| tree | c74e6fb359143ffd4a6d7288ce35e17e4517cff5 /base/message_loop.cc | |
| parent | 1426ebdee1f1475bb925ac91c81d59f874f3d456 (diff) | |
| download | chromium_src-f4681a92c958eb254b0c5ac479cf3906020a92a0.zip chromium_src-f4681a92c958eb254b0c5ac479cf3906020a92a0.tar.gz chromium_src-f4681a92c958eb254b0c5ac479cf3906020a92a0.tar.bz2 | |
Revert 62695 - Revert 62644 - During shutdown delete any pending tasks if running under Heapchecker.
BUG=50345
TEST=Suppression no longer gets used.
Original Review URL: http://codereview.chromium.org/3791006
Revert Review URL: http://codereview.chromium.org/3779008
Review URL: http://codereview.chromium.org/4111005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64125 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop.cc')
| -rw-r--r-- | base/message_loop.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/message_loop.cc b/base/message_loop.cc index b926c79..4bc81d3 100644 --- a/base/message_loop.cc +++ b/base/message_loop.cc @@ -476,7 +476,7 @@ bool MessageLoop::DeletePendingTasks() { // 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) +#if defined(PURIFY) || defined(USE_HEAPCHECKER) delete pending_task.task; #elif defined(OS_POSIX) if (RUNNING_ON_VALGRIND) @@ -489,7 +489,7 @@ bool MessageLoop::DeletePendingTasks() { // 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) +#if defined(PURIFY) || defined(USE_HEAPCHECKER) task = deferred_non_nestable_work_queue_.front().task; #elif defined(OS_POSIX) if (RUNNING_ON_VALGRIND) |