Remove base/move.h

mojo/public/cpp/bindings/associated_interface_request.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_REQUEST_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_INTERFACE_REQUEST_H_
 
 #include <utility>
 
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h"
 
 namespace mojo {
 
 // AssociatedInterfaceRequest represents an associated interface request. It is
 // similar to InterfaceRequest except that it doesn't own a message pipe handle.
 template <typename Interface>
 class AssociatedInterfaceRequest {
-  DISALLOW_COPY_AND_ASSIGN_WITH_MOVE_FOR_BIND(AssociatedInterfaceRequest);
-
  public:
   // Constructs an empty AssociatedInterfaceRequest, representing that the
   // client is not requesting an implementation of Interface.
   AssociatedInterfaceRequest() {}
   AssociatedInterfaceRequest(decltype(nullptr)) {}
 
   // Takes the interface endpoint handle from another
   // AssociatedInterfaceRequest.
   AssociatedInterfaceRequest(AssociatedInterfaceRequest&& other) {
     handle_ = std::move(other.handle_);
@@ skipping 30 matching lines @@
     if (this == &other)
       return true;
 
     // Now that the two refer to different objects, they are equivalent if
     // and only if they are both invalid.
     return !is_pending() && !other.is_pending();
   }
 
  private:
   ScopedInterfaceEndpointHandle handle_;
+
+  DISALLOW_COPY_AND_ASSIGN(AssociatedInterfaceRequest);
 };
 
 // Makes an AssociatedInterfaceRequest bound to the specified associated
 // endpoint.
 template <typename Interface>
 AssociatedInterfaceRequest<Interface> MakeAssociatedRequest(
     ScopedInterfaceEndpointHandle handle) {
   AssociatedInterfaceRequest<Interface> request;
   request.Bind(std::move(handle));
   return request;
 }
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_INTERFACE_REQUEST_H_