Revert of Deletes mojo::Callback

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

 // Copyright 2013 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 "mojo/public/cpp/bindings/lib/connector.h"
 
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 #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"
 #include "mojo/public/cpp/bindings/lib/message_builder.h"
 #include "mojo/public/cpp/bindings/tests/message_queue.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace test {
 namespace {
 
 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;
   }
 
   bool IsEmpty() const { return queue_.IsEmpty(); }
 
   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 {
  public:
   ConnectorDeletingMessageAccumulator(internal::Connector** connector)
       : connector_(connector) {}
 
   bool Accept(Message* message) override {
     delete *connector_;
     *connector_ = nullptr;
@@ skipping 532 matching lines @@
   connector1.set_incoming_receiver(&accumulator);
 
   run_loop.Run();
 
   ASSERT_EQ(2u, accumulator.size());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo