Rename MOVE_ONLY_TYPE_WITH_MOVE_CONSTRUCTOR_FOR_CPP_03

mojo/public/cpp/bindings/lib/scoped_interface_endpoint_handle.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_LIB_SCOPED_INTERFACE_ENDPOINT_HANDLE_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_SCOPED_INTERFACE_ENDPOINT_HANDLE_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/move.h"
 #include "mojo/public/cpp/bindings/lib/interface_id.h"
 
 namespace mojo {
 namespace internal {
 
 class MultiplexRouter;
 
 // ScopedInterfaceEndpointHandle refers to one end of an interface, either the
 // implementation side or the client side.
 class ScopedInterfaceEndpointHandle {
-  MOVE_ONLY_TYPE_WITH_MOVE_CONSTRUCTOR_FOR_CPP_03(
-      ScopedInterfaceEndpointHandle);
+  DISALLOW_COPY_AND_ASSIGN_WITH_MOVE_FOR_BIND(ScopedInterfaceEndpointHandle);
 
  public:
   // Creates an invalid endpoint handle.
   ScopedInterfaceEndpointHandle();
 
   // This is supposed to be used by MultiplexRouter only.
   // |id| is the corresponding interface ID.
   // If |is_local| is false, this handle is meant to be passed over |router| to
   // the remote side.
   ScopedInterfaceEndpointHandle(InterfaceId id,
@@ skipping 22 matching lines @@
  private:
   InterfaceId id_;
   bool is_local_;
   scoped_refptr<MultiplexRouter> router_;
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_SCOPED_INTERFACE_ENDPOINT_HANDLE_H_