Move //mojo/{public, edk} underneath //third_party

mojo/public/cpp/system/macros.h

Index: mojo/public/cpp/system/macros.h
diff --git a/mojo/public/cpp/system/macros.h b/mojo/public/cpp/system/macros.h
deleted file mode 100644
index f2bd0bcc6fbff5c6c83f8aed68dcf92fa20332d8..0000000000000000000000000000000000000000
--- a/mojo/public/cpp/system/macros.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// 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_SYSTEM_MACROS_H_
-#define MOJO_PUBLIC_CPP_SYSTEM_MACROS_H_
-
-#include "mojo/public/c/system/macros.h"
-
-// Define a set of C++ specific macros.
-// Mojo C++ API users can assume that mojo/public/cpp/system/macros.h
-// includes mojo/public/c/system/macros.h.
-
-// A macro to disallow the copy constructor and operator= functions.
-// This should be used in the private: declarations for a class.
-#define MOJO_DISALLOW_COPY_AND_ASSIGN(TypeName) \
-  TypeName(const TypeName&);                    \
-  void operator=(const TypeName&)
-
-// Used to calculate the number of elements in an array.
-// (See |arraysize()| in Chromium's base/basictypes.h for more details.)
-namespace mojo {
-template <typename T, size_t N>
-char(&ArraySizeHelper(T(&array)[N]))[N];
-#if !defined(_MSC_VER)
-template <typename T, size_t N>
-char(&ArraySizeHelper(const T(&array)[N]))[N];
-#endif
-}  // namespace mojo
-#define MOJO_ARRAYSIZE(array) (sizeof(::mojo::ArraySizeHelper(array)))
-
-// Used to make a type move-only. See Chromium's base/move.h for more
-// details. The MoveOnlyTypeForCPP03 typedef is for Chromium's base/callback to
-// tell that this type is move-only.
-#define MOJO_MOVE_ONLY_TYPE(type)                                              \
- private:                                                                      \
-  type(type&);                                                                 \
-  void operator=(type&);                                                       \
-                                                                               \
- public:                                                                       \
-  type&& Pass() MOJO_WARN_UNUSED_RESULT { return static_cast<type&&>(*this); } \
-  typedef void MoveOnlyTypeForCPP03;                                           \
-                                                                               \
- private:
-#endif  // MOJO_PUBLIC_CPP_SYSTEM_MACROS_H_