Revert 115997 - Replace MessageLoop::DeleteSoon implementation with one that uses base::Bind.

BUG=none
TEST=none
TBR=willchan,brettw,tony

Review URL: http://codereview.chromium.org/9004051

TBR=dcheng@chromium.org
Review URL: http://codereview.chromium.org/9034029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115999 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 9 deletions

diff --git a/base/message_loop_proxy.h b/base/message_loop_proxy.h
index 738f39f..aac11b9 100644
--- a/base/message_loop_proxy.h
+++ b/base/message_loop_proxy.h
@@ -10,7 +10,6 @@
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
-#include "base/message_loop_helpers.h"
 #include "base/task.h"
 
 namespace tracked_objects {
@@ -122,9 +121,8 @@ class BASE_EXPORT MessageLoopProxy
 
   template <class T>
   bool DeleteSoon(const tracked_objects::Location& from_here,
-                  const T* object) {
-    return base::subtle::DeleteHelperInternal<T, bool>::DeleteOnMessageLoop(
-        this, from_here, object);
+                  T* object) {
+    return PostNonNestableTask(from_here, new DeleteTask<T>(object));
   }
   template <class T>
   bool ReleaseSoon(const tracked_objects::Location& from_here,
@@ -137,7 +135,6 @@ class BASE_EXPORT MessageLoopProxy
   static scoped_refptr<MessageLoopProxy> current();
 
  protected:
-  template <class T, class R> friend class subtle::DeleteHelperInternal;
   friend class RefCountedThreadSafe<MessageLoopProxy, MessageLoopProxyTraits>;
   friend struct MessageLoopProxyTraits;
 
@@ -147,10 +144,6 @@ class BASE_EXPORT MessageLoopProxy
   // Called when the proxy is about to be deleted. Subclasses can override this
   // to provide deletion on specific threads.
   virtual void OnDestruct() const;
-
-  bool DeleteSoonInternal(const tracked_objects::Location& from_here,
-                          void(*deleter)(const void*),
-                          const void* object);
 };
 
 struct MessageLoopProxyTraits {