Revert of Deletes mojo::Callback

mojo/public/cpp/bindings/tests/connector_unittest.cc

Index: mojo/public/cpp/bindings/tests/connector_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/connector_unittest.cc b/mojo/public/cpp/bindings/tests/connector_unittest.cc
index 0a81c9b85843f6b3bac8bb87de87e4a927663952..810ab8b88fcd138b89dc7fadb12a4403049652cf 100644
--- a/mojo/public/cpp/bindings/tests/connector_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/connector_unittest.cc
@@ -10,8 +10,6 @@
 #include <utility>
 
 #include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ -26,13 +24,15 @@
 class MessageAccumulator : public MessageReceiver {
  public:
   MessageAccumulator() {}
-  explicit MessageAccumulator(const base::Closure& closure)
-      : closure_(closure) {}
+  explicit MessageAccumulator(const Closure& closure) : closure_(closure) {}
 
   bool Accept(Message* message) override {
     queue_.Push(message);
-    if (!closure_.is_null())
-      base::ResetAndReturn(&closure_).Run();
+    if (!closure_.is_null()) {
+      Closure closure = closure_;
+      closure_.Reset();
+      closure.Run();
+    }
     return true;
   }
 
@@ -40,13 +40,13 @@
 
   void Pop(Message* message) { queue_.Pop(message); }
 
-  void set_closure(const base::Closure& closure) { closure_ = closure; }
+  void set_closure(const Closure& closure) { closure_ = closure; }
 
   size_t size() const { return queue_.size(); }
 
  private:
   MessageQueue queue_;
-  base::Closure closure_;
+  Closure closure_;
 };
 
 class ConnectorDeletingMessageAccumulator : public MessageAccumulator {