Remove MOJO_DISALLOW_COPY_AND_ASSIGN and MOJO_ALLOW_UNUSED_LOCAL.

mojo/public/cpp/bindings/lib/fixed_buffer.h

Index: mojo/public/cpp/bindings/lib/fixed_buffer.h
diff --git a/mojo/public/cpp/bindings/lib/fixed_buffer.h b/mojo/public/cpp/bindings/lib/fixed_buffer.h
index 5f5f746fbe071ada5fb85da27012550f4dcd9f0f..d087c3b36a527d7c9dbca1007af306e9b162758f 100644
--- a/mojo/public/cpp/bindings/lib/fixed_buffer.h
+++ b/mojo/public/cpp/bindings/lib/fixed_buffer.h
@@ -7,8 +7,8 @@
 
 #include <stddef.h>
 
+#include "base/macros.h"
 #include "mojo/public/cpp/bindings/lib/buffer.h"
-#include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
 namespace internal {
@@ -58,7 +58,7 @@ class FixedBuffer : public Buffer {
   size_t cursor_;
   size_t size_;
 
-  MOJO_DISALLOW_COPY_AND_ASSIGN(FixedBuffer);
+  DISALLOW_COPY_AND_ASSIGN(FixedBuffer);
 };
 
 class FixedBufferForTesting : public FixedBuffer {
@@ -73,7 +73,7 @@ class FixedBufferForTesting : public FixedBuffer {
   void* Leak();
 
  private:
-  MOJO_DISALLOW_COPY_AND_ASSIGN(FixedBufferForTesting);
+  DISALLOW_COPY_AND_ASSIGN(FixedBufferForTesting);
 };
 
 }  // namespace internal