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

base/message_loop_proxy.h

 // Copyright (c) 2011 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.
 
 #ifndef BASE_MESSAGE_LOOP_PROXY_H_
 #define BASE_MESSAGE_LOOP_PROXY_H_
 #pragma once
 
 #include "base/base_export.h"
 #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 {
 class Location;
 } // namespace tracked_objects
 
 namespace base {
 
 struct MessageLoopProxyTraits;
 
@@ skipping 91 matching lines @@
   //   * The DataLoader object has no special thread safety.
   //   * The DataLoader object can be deleted while |task| is still running,
   //     and the reply will cancel itself safely because it is bound to a
   //     WeakPtr<>.
   bool PostTaskAndReply(const tracked_objects::Location& from_here,
                         const Closure& task,
                         const Closure& reply);
 
   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,
                    T* object) {
     return PostNonNestableTask(from_here, new ReleaseTask<T>(object));
   }
 
   // Gets the MessageLoopProxy for the current message loop, creating one if
   // needed.
   static scoped_refptr<MessageLoopProxy> current();
 
  protected:
-  template <class T, class R> friend class subtle::DeleteHelperInternal;
   friend class RefCountedThreadSafe<MessageLoopProxy, MessageLoopProxyTraits>;
   friend struct MessageLoopProxyTraits;
 
   MessageLoopProxy();
   virtual ~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 {
   static void Destruct(const MessageLoopProxy* proxy) {
     proxy->OnDestruct();
   }
 };
 
 }  // namespace base
 
 #endif  // BASE_MESSAGE_LOOP_PROXY_H_