Remove base/move.h

mojo/public/cpp/bindings/interface_ptr.h

Index: mojo/public/cpp/bindings/interface_ptr.h
diff --git a/mojo/public/cpp/bindings/interface_ptr.h b/mojo/public/cpp/bindings/interface_ptr.h
index 041c24264147084046654e4a41905f9b95d7a537..7bc8921cd66d55c69205f72faa7b16ec1f499500 100644
--- a/mojo/public/cpp/bindings/interface_ptr.h
+++ b/mojo/public/cpp/bindings/interface_ptr.h
@@ -36,8 +36,6 @@ class AssociatedGroup;
 // any thread.
 template <typename Interface>
 class InterfacePtr {
-  DISALLOW_COPY_AND_ASSIGN_WITH_MOVE_FOR_BIND(InterfacePtr);
-
  public:
   // Constructs an unbound InterfacePtr.
   InterfacePtr() {}
@@ -201,6 +199,7 @@ class InterfacePtr {
   // 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;
@@ -222,6 +221,8 @@ class InterfacePtr {
   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