Revert of Deletes mojo::Callback

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

 // Copyright 2015 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 <stdint.h>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 33 matching lines @@
   return base::Bind(&SaveValue, last_value_seen, closure);
 }
 
 // An implementation of sample::Provider used on the server side.
 // It only implements one of the methods: EchoInt().
 // All it does is save the values and Callbacks it sees.
 class InterfaceImpl : public sample::Provider {
  public:
   InterfaceImpl()
       : last_server_value_seen_(0),
-        callback_saved_(new EchoIntCallback) {}
+        callback_saved_(new Callback<void(int32_t)>()) {}
 
   ~InterfaceImpl() override {
     if (callback_saved_) {
       delete callback_saved_;
     }
   }
 
   // Run's the callback previously saved from the last invocation
   // of |EchoInt()|.
   bool RunCallback() {
     if (callback_saved_) {
       callback_saved_->Run(last_server_value_seen_);
       return true;
     }
     return false;
   }
 
   // Delete's the previously saved callback.
   void DeleteCallback() {
     delete callback_saved_;
     callback_saved_ = nullptr;
   }
 
   // sample::Provider implementation
 
   // Saves its two input values in member variables and does nothing else.
-  void EchoInt(int32_t x, const EchoIntCallback& callback) override {
+  void EchoInt(int32_t x, const Callback<void(int32_t)>& callback) override {
     last_server_value_seen_ = x;
     *callback_saved_ = callback;
     if (!closure_.is_null()) {
       closure_.Run();
       closure_.Reset();
     }
   }
 
   void EchoString(const String& a,
-                  const EchoStringCallback& callback) override {
+                  const Callback<void(String)>& callback) override {
     CHECK(false) << "Not implemented.";
   }
 
   void EchoStrings(const String& a,
                    const String& b,
-                   const EchoStringsCallback& callback) override {
+                   const Callback<void(String, String)>& callback) override {
     CHECK(false) << "Not implemented.";
   }
 
   void EchoMessagePipeHandle(
       ScopedMessagePipeHandle a,
-      const EchoMessagePipeHandleCallback& callback) override {
+      const Callback<void(ScopedMessagePipeHandle)>& callback) override {
     CHECK(false) << "Not implemented.";
   }
 
-  void EchoEnum(sample::Enum a, const EchoEnumCallback& callback) override {
+  void EchoEnum(sample::Enum a,
+                const Callback<void(sample::Enum)>& callback) override {
     CHECK(false) << "Not implemented.";
   }
 
   void resetLastServerValueSeen() { last_server_value_seen_ = 0; }
 
   int32_t last_server_value_seen() const { return last_server_value_seen_; }
 
   void set_closure(const base::Closure& closure) { closure_ = closure; }
 
  private:
   int32_t last_server_value_seen_;
-  EchoIntCallback* callback_saved_;
+  Callback<void(int32_t)>* callback_saved_;
   base::Closure closure_;
 };
 
 class BindingCallbackTest : public testing::Test {
  public:
   BindingCallbackTest() {}
   ~BindingCallbackTest() override {}
 
  protected:
   int32_t last_client_callback_value_seen_;
@@ skipping 207 matching lines @@
   regex.clear();
 #endif  // OS_WIN
   EXPECT_DEATH_IF_SUPPORTED(server_impl.DeleteCallback(), regex.c_str());
 #endif  // (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) &&
         // !defined(OS_ANDROID)
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo