Revert of Remove base/move.h

mojo/public/cpp/bindings/tests/container_test_util.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_TESTS_CONTAINER_TEST_UTIL_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_TESTS_CONTAINER_TEST_UTIL_H_
 
 #include <stddef.h>
 
-#include "base/macros.h"
+#include "base/move.h"
 
 namespace mojo {
 
 class CopyableType {
  public:
   CopyableType();
   CopyableType(const CopyableType& other);
   CopyableType& operator=(const CopyableType& other);
   ~CopyableType();
 
   bool copied() const { return copied_; }
   static size_t num_instances() { return num_instances_; }
   CopyableType* ptr() const { return ptr_; }
   void ResetCopied() { copied_ = false; }
 
  private:
   bool copied_;
   static size_t num_instances_;
   CopyableType* ptr_;
 };
 
 class MoveOnlyType {
+  MOVE_ONLY_TYPE_FOR_CPP_03(MoveOnlyType);
  public:
   typedef MoveOnlyType Data_;
   MoveOnlyType();
   MoveOnlyType(MoveOnlyType&& other);
   MoveOnlyType& operator=(MoveOnlyType&& other);
   ~MoveOnlyType();
 
   bool moved() const { return moved_; }
   static size_t num_instances() { return num_instances_; }
   MoveOnlyType* ptr() const { return ptr_; }
   void ResetMoved() { moved_ = false; }
 
  private:
   bool moved_;
   static size_t num_instances_;
   MoveOnlyType* ptr_;
-
-  DISALLOW_COPY_AND_ASSIGN(MoveOnlyType);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_TESTS_CONTAINER_TEST_UTIL_H_