Revert of Remove base/move.h

mojo/public/cpp/bindings/map.h

Index: mojo/public/cpp/bindings/map.h
diff --git a/mojo/public/cpp/bindings/map.h b/mojo/public/cpp/bindings/map.h
index 106434bcbdac565763c4a9647ef650b40d0806d1..5771a82aac23357a76b06f780d39f5efe694c663 100644
--- a/mojo/public/cpp/bindings/map.h
+++ b/mojo/public/cpp/bindings/map.h
@@ -10,7 +10,7 @@
 #include <utility>
 
 #include "base/logging.h"
-#include "base/macros.h"
+#include "base/move.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/lib/map_data_internal.h"
 #include "mojo/public/cpp/bindings/lib/template_util.h"
@@ -29,6 +29,8 @@
 //     using the insert() method.
 template <typename K, typename V>
 class Map {
+  MOVE_ONLY_TYPE_FOR_CPP_03(Map);
+
  public:
   using Key = K;
   using Value = V;
@@ -260,8 +262,6 @@
 
   std::map<Key, Value> map_;
   bool is_null_;
-
-  DISALLOW_COPY_AND_ASSIGN(Map);
 };
 
 // Copies the contents of an std::map to a new Map, optionally changing the