Remove MOJO_DISALLOW_COPY_AND_ASSIGN and MOJO_ALLOW_UNUSED_LOCAL.

mojo/public/cpp/bindings/lib/bounds_checker.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_LIB_BOUNDS_CHECKER_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_BOUNDS_CHECKER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
-#include "mojo/public/cpp/system/macros.h"
+#include "base/macros.h"
 
 namespace mojo {
 
 class Handle;
 
 namespace internal {
 
 // BoundsChecker is used to validate object sizes, pointers and handle indices
 // for payload of incoming messages.
 class BoundsChecker {
@@ skipping 26 matching lines @@
   bool InternalIsValidRange(uintptr_t begin, uintptr_t end) const;
 
   // [data_begin_, data_end_) is the valid memory range.
   uintptr_t data_begin_;
   uintptr_t data_end_;
 
   // [handle_begin_, handle_end_) is the valid handle index range.
   uint32_t handle_begin_;
   uint32_t handle_end_;
 
-  MOJO_DISALLOW_COPY_AND_ASSIGN(BoundsChecker);
+  DISALLOW_COPY_AND_ASSIGN(BoundsChecker);
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_BOUNDS_CHECKER_H_