Remove base/move.h

mojo/public/cpp/bindings/array.h

 // Copyright 2013 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_ARRAY_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_ARRAY_H_
 
 #include <stddef.h>
 #include <string.h>
 #include <algorithm>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "base/move.h"
+#include "base/macros.h"
 #include "mojo/public/cpp/bindings/lib/array_internal.h"
 #include "mojo/public/cpp/bindings/lib/bindings_internal.h"
 #include "mojo/public/cpp/bindings/lib/template_util.h"
 #include "mojo/public/cpp/bindings/type_converter.h"
 
 namespace mojo {
 
 // Represents a moveable array with contents of type |T|. The array can be null,
 // meaning that no value has been assigned to it. Null is distinct from empty.
 template <typename T>
 class Array {
-  MOVE_ONLY_TYPE_FOR_CPP_03(Array);
-
  public:
   using ConstRefType = typename std::vector<T>::const_reference;
   using RefType = typename std::vector<T>::reference;
 
   using Element = T;
   using Data_ = internal::Array_Data<
       typename internal::GetDataTypeAsArrayElement<T>::Data>;
 
   using iterator = typename std::vector<T>::iterator;
   using const_iterator = typename std::vector<T>::const_iterator;
@@ skipping 168 matching lines @@
   template <typename U>
   bool operator!=(const Array<U>& other) const = delete;
 
   void Take(Array* other) {
     operator=(nullptr);
     Swap(other);
   }
 
   std::vector<T> vec_;
   bool is_null_;
+
+  DISALLOW_COPY_AND_ASSIGN(Array);
 };
 
 // A |TypeConverter| that will create an |Array<T>| containing a copy of the
 // contents of an |std::vector<E>|, using |TypeConverter<T, E>| to copy each
 // element. The returned array will always be non-null.
 template <typename T, typename E>
 struct TypeConverter<Array<T>, std::vector<E>> {
   static Array<T> Convert(const std::vector<E>& input) {
     Array<T> result(input.size());
     for (size_t i = 0; i < input.size(); ++i)
@@ skipping 52 matching lines @@
   if (a.is_null())
     return !b.is_null();
   if (b.is_null())
     return false;
   return a.storage() < b.storage();
 }
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_ARRAY_H_