| Index: base/message_loop.h
|
| ===================================================================
|
| --- base/message_loop.h (revision 115998)
|
| +++ base/message_loop.h (working copy)
|
| @@ -14,7 +14,6 @@
|
| #include "base/callback_forward.h"
|
| #include "base/location.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/message_loop_helpers.h"
|
| #include "base/message_loop_proxy.h"
|
| #include "base/message_pump.h"
|
| #include "base/observer_list.h"
|
| @@ -209,8 +208,7 @@
|
| // from RefCountedThreadSafe<T>!
|
| template <class T>
|
| void DeleteSoon(const tracked_objects::Location& from_here, const T* object) {
|
| - base::subtle::DeleteHelperInternal<T, void>::DeleteOnMessageLoop(
|
| - this, from_here, object);
|
| + PostNonNestableTask(from_here, new DeleteTask<T>(object));
|
| }
|
|
|
| // A variant on PostTask that releases the given reference counted object
|
| @@ -534,12 +532,6 @@
|
| scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
|
|
|
| private:
|
| - template <class T, class R> friend class base::subtle::DeleteHelperInternal;
|
| -
|
| - void DeleteSoonInternal(const tracked_objects::Location& from_here,
|
| - void(*deleter)(const void*),
|
| - const void* object);
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(MessageLoop);
|
| };
|
|
|
|
|