Revert of Remove base/move.h

mojo/public/cpp/bindings/interface_ptr.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_INTERFACE_PTR_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_PTR_H_
 
 #include <stdint.h>
 #include <utility>
 
@@ skipping 18 matching lines @@
 // This class is thread hostile, as is the local proxy it manages, while bound
 // to a message pipe. All calls to this class or the proxy should be from the
 // same thread that bound it. If you need to move the proxy to a different
 // thread, extract the InterfacePtrInfo (containing just the message pipe and
 // any version information) using PassInterface(), pass it to a different
 // thread, and create and bind a new InterfacePtr from that thread. If an
 // InterfacePtr is not bound to a message pipe, it may be bound or destroyed on
 // any thread.
 template <typename Interface>
 class InterfacePtr {
+  DISALLOW_COPY_AND_ASSIGN_WITH_MOVE_FOR_BIND(InterfacePtr);
+
  public:
   // Constructs an unbound InterfacePtr.
   InterfacePtr() {}
   InterfacePtr(decltype(nullptr)) {}
 
   // Takes over the binding of another InterfacePtr.
   InterfacePtr(InterfacePtr&& other) {
     internal_state_.Swap(&other.internal_state_);
   }
 
@@ skipping 143 matching lines @@
 
   // DO NOT USE. Exposed only for internal use and for testing.
   internal::InterfacePtrState<Interface, Interface::PassesAssociatedKinds_>*
   internal_state() {
     return &internal_state_;
   }
 
   // Allow InterfacePtr<> to be used in boolean expressions, but not
   // implicitly convertible to a real bool (which is dangerous).
  private:
-  // TODO(dcheng): Use an explicit conversion operator.
   typedef internal::InterfacePtrState<Interface,
                                       Interface::PassesAssociatedKinds_>
       InterfacePtr::*Testable;
 
  public:
   operator Testable() const {
     return internal_state_.is_bound() ? &InterfacePtr::internal_state_
                                       : nullptr;
   }
 
  private:
   // Forbid the == and != operators explicitly, otherwise InterfacePtr will be
   // converted to Testable to do == or != comparison.
   template <typename T>
   bool operator==(const InterfacePtr<T>& other) const = delete;
   template <typename T>
   bool operator!=(const InterfacePtr<T>& other) const = delete;
 
   typedef internal::InterfacePtrState<Interface,
                                       Interface::PassesAssociatedKinds_> State;
   mutable State internal_state_;
-
-  DISALLOW_COPY_AND_ASSIGN(InterfacePtr);
 };
 
 // If |info| is valid (containing a valid message pipe handle), returns an
 // InterfacePtr bound to it. Otherwise, returns an unbound InterfacePtr.
 template <typename Interface>
 InterfacePtr<Interface> MakeProxy(
     InterfacePtrInfo<Interface> info,
     scoped_refptr<base::SingleThreadTaskRunner> runner =
         base::ThreadTaskRunnerHandle::Get()) {
   InterfacePtr<Interface> ptr;
   if (info.is_valid())
     ptr.Bind(std::move(info), std::move(runner));
   return std::move(ptr);
 }
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_PTR_H_