Revert of Deletes mojo::Callback

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

 // Copyright 2014 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_INTERFACE_PTR_STATE_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_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/logging.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/callback.h"
 #include "mojo/public/cpp/bindings/interface_ptr_info.h"
 #include "mojo/public/cpp/bindings/lib/control_message_proxy.h"
 #include "mojo/public/cpp/bindings/lib/filter_chain.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/message_header_validator.h"
 #include "mojo/public/cpp/bindings/lib/multiplex_router.h"
 #include "mojo/public/cpp/bindings/lib/router.h"
 #include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h"
 
@@ skipping 22 matching lines @@
 
   Interface* instance() {
     ConfigureProxyIfNecessary();
 
     // This will be null if the object is not bound.
     return proxy_;
   }
 
   uint32_t version() const { return version_; }
 
-  void QueryVersion(const base::Callback<void(uint32_t)>& callback) {
+  void QueryVersion(const Callback<void(uint32_t)>& callback) {
     ConfigureProxyIfNecessary();
 
     // 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_)->QueryVersion(
         base::Bind(&InterfacePtrState::OnQueryVersion, base::Unretained(this),
                    callback));
   }
 
@@ skipping 46 matching lines @@
     return InterfacePtrInfo<Interface>(
         router_ ? router_->PassMessagePipe() : std::move(handle_), version_);
   }
 
   bool is_bound() const { return handle_.is_valid() || router_; }
 
   bool encountered_error() const {
     return router_ ? router_->encountered_error() : false;
   }
 
-  void set_connection_error_handler(const base::Closure& error_handler) {
+  void set_connection_error_handler(const Closure& error_handler) {
     ConfigureProxyIfNecessary();
 
     DCHECK(router_);
     router_->set_connection_error_handler(error_handler);
   }
 
   // Returns true if bound and awaiting a response to a message.
   bool has_pending_callbacks() const {
     return router_ && router_->has_pending_responders();
   }
@@ skipping 21 matching lines @@
     FilterChain filters;
     filters.Append<MessageHeaderValidator>(Interface::Name_);
     filters.Append<typename Interface::ResponseValidator_>();
 
     router_ = new Router(std::move(handle_), std::move(filters), false,
                          std::move(runner_));
 
     proxy_ = new Proxy(router_);
   }
 
-  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);
   }
 
   Proxy* proxy_;
   Router* router_;
 
   // |proxy_| and |router_| are not initialized until read/write with the
   // message pipe handle is needed. |handle_| is valid between the Bind() call
@@ skipping 22 matching lines @@
 
   Interface* instance() {
     ConfigureProxyIfNecessary();
 
     // This will be null if the object is not bound.
     return proxy_.get();
   }
 
   uint32_t version() const { return version_; }
 
-  void QueryVersion(const base::Callback<void(uint32_t)>& callback) {
+  void QueryVersion(const Callback<void(uint32_t)>& callback) {
     ConfigureProxyIfNecessary();
 
 
     // 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(&InterfacePtrState::OnQueryVersion, base::Unretained(this),
                    callback));
   }
@@ skipping 53 matching lines @@
     return InterfacePtrInfo<Interface>(
         router_ ? router_->PassMessagePipe() : std::move(handle_), version_);
   }
 
   bool is_bound() const { return handle_.is_valid() || 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) {
     ConfigureProxyIfNecessary();
 
     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();
   }
@@ skipping 25 matching lines @@
     router_ = new MultiplexRouter(true, std::move(handle_), runner_);
     router_->SetMasterInterfaceName(Interface::Name_);
     endpoint_client_.reset(new InterfaceEndpointClient(
         router_->CreateLocalEndpointHandle(kMasterInterfaceId), nullptr,
         base::WrapUnique(new typename Interface::ResponseValidator_()), false,
         std::move(runner_)));
     proxy_.reset(new Proxy(endpoint_client_.get()));
     proxy_->serialization_context()->router = endpoint_client_->router();
   }
 
-  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);
   }
 
   scoped_refptr<MultiplexRouter> router_;
 
   std::unique_ptr<InterfaceEndpointClient> endpoint_client_;
   std::unique_ptr<Proxy> proxy_;
 
   // |router_| (as well as other members above) is not initialized until
   // read/write with the message pipe handle is needed. |handle_| is valid
   // between the Bind() call and the initialization of |router_|.
   ScopedMessagePipeHandle handle_;
   scoped_refptr<base::SingleThreadTaskRunner> runner_;
 
   uint32_t version_;
 
   DISALLOW_COPY_AND_ASSIGN(InterfacePtrState);
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_INTERFACE_PTR_STATE_H_