Revert 62644 - During shutdown delete any pending tasks if running under Heap...

base/message_loop.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/message_loop.h"
 
 #include <algorithm>
 
 #include "base/compiler_specific.h"
 #include "base/lazy_instance.h"
@@ skipping 452 matching lines @@
     work_queue_.pop();
     if (!pending_task.delayed_run_time.is_null()) {
       // We want to delete delayed tasks in the same order in which they would
       // normally be deleted in case of any funny dependencies between delayed
       // 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) || defined(USE_HEAPCHECKER)
+#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) || defined(USE_HEAPCHECKER)
+#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
     deferred_non_nestable_work_queue_.pop();
     if (task)
       delete task;
   }
   did_work |= !delayed_work_queue_.empty();
@@ skipping 183 matching lines @@
                                            Watcher *delegate) {
   return pump_libevent()->WatchFileDescriptor(
       fd,
       persistent,
       static_cast<base::MessagePumpLibevent::Mode>(mode),
       controller,
       delegate);
 }
 
 #endif