Revert of Remove base/move.h

mojo/public/cpp/bindings/tests/container_test_util.h

Index: mojo/public/cpp/bindings/tests/container_test_util.h
diff --git a/mojo/public/cpp/bindings/tests/container_test_util.h b/mojo/public/cpp/bindings/tests/container_test_util.h
index f709c1561ee76a4dd73fd52d36929fd4b42b3d4e..b2038bad436af6a79063394666fded571ec85d9c 100644
--- a/mojo/public/cpp/bindings/tests/container_test_util.h
+++ b/mojo/public/cpp/bindings/tests/container_test_util.h
@@ -7,7 +7,7 @@
 
 #include <stddef.h>
 
-#include "base/macros.h"
+#include "base/move.h"
 
 namespace mojo {
 
@@ -30,6 +30,7 @@
 };
 
 class MoveOnlyType {
+  MOVE_ONLY_TYPE_FOR_CPP_03(MoveOnlyType);
  public:
   typedef MoveOnlyType Data_;
   MoveOnlyType();
@@ -46,8 +47,6 @@
   bool moved_;
   static size_t num_instances_;
   MoveOnlyType* ptr_;
-
-  DISALLOW_COPY_AND_ASSIGN(MoveOnlyType);
 };
 
 }  // namespace mojo