Rename MOVE_ONLY_TYPE_WITH_MOVE_CONSTRUCTOR_FOR_CPP_03

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 "base/macros.h"
 #include "mojo/public/cpp/bindings/lib/scoped_interface_endpoint_handle.h"
 
 namespace mojo {
 
 namespace internal {
 class AssociatedInterfacePtrInfoHelper;
 }
 
 // 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 {
-  MOVE_ONLY_TYPE_WITH_MOVE_CONSTRUCTOR_FOR_CPP_03(AssociatedInterfacePtrInfo);
+  DISALLOW_COPY_AND_ASSIGN_WITH_MOVE_FOR_BIND(AssociatedInterfacePtrInfo);
 
  public:
   AssociatedInterfacePtrInfo() : version_(0u) {}
 
   AssociatedInterfacePtrInfo(AssociatedInterfacePtrInfo&& other)
       : handle_(other.handle_.Pass()), version_(other.version_) {
     other.version_ = 0u;
   }
 
   ~AssociatedInterfacePtrInfo() {}
@@ skipping 43 matching lines @@
   static void SetHandle(AssociatedInterfacePtrInfo<Interface>* info,
                         ScopedInterfaceEndpointHandle handle) {
     info->handle_ = handle.Pass();
   }
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_INTERFACE_PTR_INFO_H_