Remove base/move.h

mojo/public/cpp/bindings/interface_request.h

 // Copyright 2014 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_INTERFACE_REQUEST_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_REQUEST_H_
 
 #include <utility>
 
+#include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 
 namespace mojo {
 
 // Represents a request from a remote client for an implementation of Interface
 // over a specified message pipe. The implementor of the interface should
 // remove the message pipe by calling PassMessagePipe() and bind it to the
 // implementation. If this is not done, the InterfaceRequest will automatically
 // close the pipe on destruction. Can also represent the absence of a request
 // if the client did not provide a message pipe.
 template <typename Interface>
 class InterfaceRequest {
-  MOVE_ONLY_TYPE_FOR_CPP_03(InterfaceRequest);
  public:
   // Constructs an empty InterfaceRequest, representing that the client is not
   // requesting an implementation of Interface.
   InterfaceRequest() {}
   InterfaceRequest(decltype(nullptr)) {}
 
   // Takes the message pipe from another InterfaceRequest.
   InterfaceRequest(InterfaceRequest&& other) {
     handle_ = std::move(other.handle_);
   }
@@ skipping 24 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:
   ScopedMessagePipeHandle handle_;
+
+  DISALLOW_COPY_AND_ASSIGN(InterfaceRequest);
 };
 
 // Makes an InterfaceRequest bound to the specified message pipe. If |handle|
 // is empty or invalid, the resulting InterfaceRequest will represent the
 // absence of a request.
 template <typename Interface>
 InterfaceRequest<Interface> MakeRequest(ScopedMessagePipeHandle handle) {
   InterfaceRequest<Interface> request;
   request.Bind(std::move(handle));
   return std::move(request);
@@ skipping 59 matching lines @@
 bool FuseInterface(InterfaceRequest<Interface> request,
                    InterfacePtrInfo<Interface> proxy_info) {
   MojoResult result = FuseMessagePipes(request.PassMessagePipe(),
                                        proxy_info.PassHandle());
   return result == MOJO_RESULT_OK;
 }
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_REQUEST_H_