Remove base/move.h

mojo/public/cpp/bindings/strong_binding.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_STRONG_BINDING_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_STRONG_BINDING_H_
 
 #include <utility>
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/lib/filter_chain.h"
 #include "mojo/public/cpp/bindings/lib/message_header_validator.h"
 #include "mojo/public/cpp/bindings/lib/router.h"
 #include "mojo/public/cpp/system/core.h"
 
 namespace mojo {
@@ skipping 20 matching lines @@
 //     void Create(..., InterfaceRequest<Foo> request) override {
 //       new StronglyBound(std::move(request));  // The binding now owns the
 //                                               // instance of StronglyBound.
 //     }
 //   };
 //
 // This class is thread hostile once it is bound to a message pipe. Until it is
 // bound, it may be bound or destroyed on any thread.
 template <typename Interface>
 class StrongBinding {
-  MOVE_ONLY_TYPE_FOR_CPP_03(StrongBinding);
-
  public:
   explicit StrongBinding(Interface* impl) : binding_(impl) {}
 
   StrongBinding(Interface* impl, ScopedMessagePipeHandle handle)
       : StrongBinding(impl) {
     Bind(std::move(handle));
   }
 
   StrongBinding(Interface* impl, InterfacePtr<Interface>* ptr)
       : StrongBinding(impl) {
@@ skipping 43 matching lines @@
   internal::Router* internal_router() { return binding_.internal_router(); }
 
   void OnConnectionError() {
     connection_error_handler_.Run();
     delete binding_.impl();
   }
 
  private:
   Closure connection_error_handler_;
   Binding<Interface> binding_;
+
+  DISALLOW_COPY_AND_ASSIGN(StrongBinding);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_STRONG_BINDING_H_