diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-15 02:38:43 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-15 02:38:43 +0000 |
| commit | bc09770f5dd4c019574af3bfd8c150f685660003 (patch) | |
| tree | 460f09bb4edf3c93e3e9d581cf8bae3492df36fe /base/message_loop.cc | |
| parent | 935aa54d9a5e2e617c61c9f8dcea398768413443 (diff) | |
| download | chromium_src-bc09770f5dd4c019574af3bfd8c150f685660003.zip chromium_src-bc09770f5dd4c019574af3bfd8c150f685660003.tar.gz chromium_src-bc09770f5dd4c019574af3bfd8c150f685660003.tar.bz2 | |
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
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 af1032c..8f6c997b 100644 --- a/base/message_loop.cc +++ b/base/message_loop.cc @@ -470,7 +470,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) || defined(USE_HEAPCHECKER) +#if defined(PURIFY) delete pending_task.task; #elif defined(OS_POSIX) if (RUNNING_ON_VALGRIND) @@ -483,7 +483,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) || defined(USE_HEAPCHECKER) +#if defined(PURIFY) task = deferred_non_nestable_work_queue_.front().task; #elif defined(OS_POSIX) if (RUNNING_ON_VALGRIND) |