Revert of Remove base/move.h

mojo/public/cpp/bindings/map.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_MAP_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_MAP_H_
 
 #include <stddef.h>
 #include <map>
 #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"
 #include "mojo/public/cpp/bindings/type_converter.h"
 
 namespace mojo {
 
 // A move-only map that can handle move-only values. Map has the following
 // characteristics:
 //   - The map itself can be null, and this is distinct from empty.
 //   - Keys must not be move-only.
 //   - The Key-type's "<" operator is used to sort the entries, and also is
 //     used to determine equality of the key values.
 //   - There can only be one entry per unique key.
 //   - Values of move-only types will be moved into the Map when they are added
 //     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;
 
   // Map keys cannot be move only classes.
   static_assert(!internal::IsMoveOnlyType<Key>::value,
                 "Map keys cannot be move only types.");
 
   using Iterator = typename std::map<Key, Value>::iterator;
   using ConstIterator = typename std::map<Key, Value>::const_iterator;
@@ skipping 211 matching lines @@
   template <typename T, typename U>
   bool operator!=(const Map<T, U>& other) const = delete;
 
   void Take(Map* other) {
     operator=(nullptr);
     Swap(other);
   }
 
   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
 // types of the keys and values along the way using TypeConverter.
 template <typename MojoKey,
           typename MojoValue,
           typename STLKey,
           typename STLValue>
 struct TypeConverter<Map<MojoKey, MojoValue>, std::map<STLKey, STLValue>> {
   static Map<MojoKey, MojoValue> Convert(
@@ skipping 24 matching lines @@
             TypeConverter<STLValue, MojoValue>::Convert(it->second)));
       }
     }
     return result;
   }
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_MAP_H_