Remove MOJO_DISALLOW_COPY_AND_ASSIGN and MOJO_ALLOW_UNUSED_LOCAL.

mojo/edk/system/waiter.h

Index: mojo/edk/system/waiter.h
diff --git a/mojo/edk/system/waiter.h b/mojo/edk/system/waiter.h
index fa8e8361f094126632a9a451bb275d5ee27f1bc2..ca53f405360a2063a09e3cd9cb3f2cc0431c2c82 100644
--- a/mojo/edk/system/waiter.h
+++ b/mojo/edk/system/waiter.h
@@ -7,12 +7,12 @@
 
 #include <stdint.h>
 
+#include "base/macros.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
 #include "mojo/edk/system/awakable.h"
 #include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/c/system/types.h"
-#include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
 namespace edk {
@@ -70,7 +70,7 @@ class MOJO_SYSTEM_IMPL_EXPORT Waiter final : public Awakable {
   MojoResult awake_result_;
   uintptr_t awake_context_;
 
-  MOJO_DISALLOW_COPY_AND_ASSIGN(Waiter);
+  DISALLOW_COPY_AND_ASSIGN(Waiter);
 };
 
 }  // namespace edk