Remove base/move.h

mojo/public/cpp/bindings/associated_interface_ptr_info.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_ASSOCIATED_INTERFACE_PTR_INFO_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_INTERFACE_PTR_INFO_H_
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h"
 
 namespace mojo {
 
 // AssociatedInterfacePtrInfo stores necessary information to construct an
 // associated interface pointer. It is similar to InterfacePtrInfo except that
 // it doesn't own a message pipe handle.
 template <typename Interface>
 class AssociatedInterfacePtrInfo {
-  DISALLOW_COPY_AND_ASSIGN_WITH_MOVE_FOR_BIND(AssociatedInterfacePtrInfo);
-
  public:
   AssociatedInterfacePtrInfo() : version_(0u) {}
 
   AssociatedInterfacePtrInfo(AssociatedInterfacePtrInfo&& other)
       : handle_(std::move(other.handle_)), version_(other.version_) {
     other.version_ = 0u;
   }
 
   AssociatedInterfacePtrInfo(ScopedInterfaceEndpointHandle handle,
                              uint32_t version)
@@ skipping 29 matching lines @@
       return true;
 
     // Now that the two refer to different objects, they are equivalent if
     // and only if they are both invalid.
     return !is_valid() && !other.is_valid();
   }
 
  private:
   ScopedInterfaceEndpointHandle handle_;
   uint32_t version_;
+
+  DISALLOW_COPY_AND_ASSIGN(AssociatedInterfacePtrInfo);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_INTERFACE_PTR_INFO_H_