Revert of Deletes mojo::Callback

mojo/public/cpp/bindings/lib/associated_interface_ptr_state.h

 // 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.
 
 #ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_ASSOCIATED_INTERFACE_PTR_STATE_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_ASSOCIATED_INTERFACE_PTR_STATE_H_
 
 #include <stdint.h>
 
 #include <algorithm>  // For |std::swap()|.
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
-#include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
 #include "mojo/public/cpp/bindings/associated_group.h"
 #include "mojo/public/cpp/bindings/associated_interface_ptr_info.h"
+#include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/public/cpp/bindings/lib/control_message_proxy.h"
 #include "mojo/public/cpp/bindings/lib/interface_endpoint_client.h"
 #include "mojo/public/cpp/bindings/lib/interface_id.h"
 #include "mojo/public/cpp/bindings/lib/multiplex_router.h"
 #include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 
 namespace mojo {
 namespace internal {
 
@@ skipping 12 matching lines @@
     return proxy_.get();
   }
 
   uint32_t version() const { return version_; }
 
   uint32_t interface_id() const {
     DCHECK(is_bound());
     return endpoint_client_->interface_id();
   }
 
-  void QueryVersion(const base::Callback<void(uint32_t)>& callback) {
+  void QueryVersion(const Callback<void(uint32_t)>& callback) {
     // Do a static cast in case the interface contains methods with the same
     // name. It is safe to capture |this| because the callback won't be run
     // after this object goes away.
     static_cast<ControlMessageProxy*>(proxy_.get())
         ->QueryVersion(base::Bind(&AssociatedInterfacePtrState::OnQueryVersion,
                                   base::Unretained(this), callback));
   }
 
   void RequireVersion(uint32_t version) {
     if (version <= version_)
@@ skipping 36 matching lines @@
     proxy_.reset();
     return AssociatedInterfacePtrInfo<Interface>(std::move(handle), version_);
   }
 
   bool is_bound() const { return !!endpoint_client_; }
 
   bool encountered_error() const {
     return endpoint_client_ ? endpoint_client_->encountered_error() : false;
   }
 
-  void set_connection_error_handler(const base::Closure& error_handler) {
+  void set_connection_error_handler(const Closure& error_handler) {
     DCHECK(endpoint_client_);
     endpoint_client_->set_connection_error_handler(error_handler);
   }
 
   // Returns true if bound and awaiting a response to a message.
   bool has_pending_callbacks() const {
     return endpoint_client_ && endpoint_client_->has_pending_responders();
   }
 
   AssociatedGroup* associated_group() {
     return endpoint_client_ ? endpoint_client_->associated_group() : nullptr;
   }
 
  private:
   using Proxy = typename Interface::Proxy_;
 
-  void OnQueryVersion(const base::Callback<void(uint32_t)>& callback,
+  void OnQueryVersion(const Callback<void(uint32_t)>& callback,
                       uint32_t version) {
     version_ = version;
     callback.Run(version);
   }
 
   std::unique_ptr<InterfaceEndpointClient> endpoint_client_;
   std::unique_ptr<Proxy> proxy_;
 
   uint32_t version_;
 
   DISALLOW_COPY_AND_ASSIGN(AssociatedInterfacePtrState);
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_ASSOCIATED_INTERFACE_PTR_STATE_H_