Revert of Deletes mojo::Callback

mojo/public/cpp/bindings/lib/binding_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_BINDING_STATE_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDING_STATE_H_
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
-#include "base/callback.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.h"
 #include "mojo/public/cpp/bindings/interface_ptr_info.h"
 #include "mojo/public/cpp/bindings/interface_request.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 59 matching lines @@
     DestroyRouter();
   }
 
   InterfaceRequest<Interface> Unbind() {
     InterfaceRequest<Interface> request =
         MakeRequest<Interface>(router_->PassMessagePipe());
     DestroyRouter();
     return std::move(request);
   }
 
-  void set_connection_error_handler(const base::Closure& error_handler) {
+  void set_connection_error_handler(const Closure& error_handler) {
     DCHECK(is_bound());
     connection_error_handler_ = error_handler;
   }
 
   Interface* impl() { return impl_; }
 
   bool is_bound() const { return !!router_; }
 
   MessagePipeHandle handle() const {
     DCHECK(is_bound());
     return router_->handle();
   }
 
   AssociatedGroup* associated_group() { return nullptr; }
 
   void EnableTestingMode() {
     DCHECK(is_bound());
     router_->EnableTestingMode();
   }
 
  private:
   void DestroyRouter() {
-    router_->set_connection_error_handler(base::Closure());
+    router_->set_connection_error_handler(Closure());
     delete router_;
     router_ = nullptr;
     connection_error_handler_.Reset();
   }
 
   void RunConnectionErrorHandler() {
     if (!connection_error_handler_.is_null())
       connection_error_handler_.Run();
   }
 
   internal::Router* router_ = nullptr;
   typename Interface::Stub_ stub_;
   Interface* impl_;
-  base::Closure connection_error_handler_;
+  Closure connection_error_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(BindingState);
 };
 
 // Uses a multiplexing router. If |Interface| has methods to pass associated
 // interface pointers or requests, this specialization should be used.
 template <typename Interface>
 class BindingState<Interface, true> {
  public:
   explicit BindingState(Interface* impl) : impl_(impl) {
@@ skipping 51 matching lines @@
 
   InterfaceRequest<Interface> Unbind() {
     endpoint_client_.reset();
     InterfaceRequest<Interface> request =
         MakeRequest<Interface>(router_->PassMessagePipe());
     router_ = nullptr;
     connection_error_handler_.Reset();
     return request;
   }
 
-  void set_connection_error_handler(const base::Closure& error_handler) {
+  void set_connection_error_handler(const Closure& error_handler) {
     DCHECK(is_bound());
     connection_error_handler_ = error_handler;
   }
 
   Interface* impl() { return impl_; }
 
   bool is_bound() const { return !!router_; }
 
   MessagePipeHandle handle() const {
     DCHECK(is_bound());
@@ skipping 13 matching lines @@
   void RunConnectionErrorHandler() {
     if (!connection_error_handler_.is_null())
       connection_error_handler_.Run();
   }
 
   scoped_refptr<internal::MultiplexRouter> router_;
   std::unique_ptr<internal::InterfaceEndpointClient> endpoint_client_;
 
   typename Interface::Stub_ stub_;
   Interface* impl_;
-  base::Closure connection_error_handler_;
+  Closure connection_error_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(BindingState);
 };
 
 }  // namesapce internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDING_STATE_H_