Remove base/move.h

mojo/public/cpp/bindings/wtf_array.h

 // Copyright 2016 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_WTF_ARRAY_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_WTF_ARRAY_H_
 
 #include <stddef.h>
 #include <utility>
 
-#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"
 #include "third_party/WebKit/Source/wtf/Vector.h"
 
 namespace mojo {
 
 // Represents an array backed by WTF::Vector. Comparing with WTF::Vector,
 // mojo::WTFArray is move-only and can be null.
 // It is easy to convert between WTF::Vector<T> and mojo::WTFArray<T>:
 //   - constructor WTFArray(WTF::Vector<T>&&) takes the contents of a
 //     WTF::Vector<T>;
 //   - method PassStorage() passes the underlying WTF::Vector.
 template <typename T>
 class WTFArray {
-  MOVE_ONLY_TYPE_FOR_CPP_03(WTFArray);
-
  public:
   using Data_ = internal::Array_Data<
       typename internal::GetDataTypeAsArrayElement<T>::Data>;
   using Element = T;
 
   // Constructs an empty array.
   WTFArray() : is_null_(false) {}
   // Constructs a null array.
   WTFArray(std::nullptr_t null_pointer) : is_null_(true) {}
 
@@ skipping 128 matching lines @@
     if (size() != other.size())
       return false;
     for (size_t i = 0; i < size(); ++i) {
       if (!internal::Equals(at(i), other.at(i)))
         return false;
     }
     return true;
   }
 
  private:
+  // TODO(dcheng): Use an explicit conversion operator.
   typedef WTF::Vector<T> WTFArray::*Testable;
 
  public:
   operator Testable() const {
     // When the array is set to null, the underlying storage |vec_| shouldn't
     // contain any elements.
     DCHECK(!is_null_ || vec_.isEmpty());
     return is_null_ ? 0 : &WTFArray::vec_;
   }
 
  private:
   // Forbid the == and != operators explicitly, otherwise WTFArray will be
   // converted to Testable to do == or != comparison.
   template <typename U>
   bool operator==(const WTFArray<U>& other) const = delete;
   template <typename U>
   bool operator!=(const WTFArray<U>& other) const = delete;
 
   void Take(WTFArray* other) {
     operator=(nullptr);
     Swap(other);
   }
 
   WTF::Vector<T> vec_;
   bool is_null_;
+
+  DISALLOW_COPY_AND_ASSIGN(WTFArray);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_WTF_ARRAY_H_