Remove MOJO_DISALLOW_COPY_AND_ASSIGN and MOJO_ALLOW_UNUSED_LOCAL.

mojo/public/cpp/utility/mutex.h

Index: mojo/public/cpp/utility/mutex.h
diff --git a/mojo/public/cpp/utility/mutex.h b/mojo/public/cpp/utility/mutex.h
index 4dc4aeecf491043a35255c5d06c7da979ff07433..0f9bee092ac15e1bf0957ca7610bd5fc00d2bdce 100644
--- a/mojo/public/cpp/utility/mutex.h
+++ b/mojo/public/cpp/utility/mutex.h
@@ -11,6 +11,7 @@
 
 #include <pthread.h>
 
+#include "base/macros.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
@@ -48,7 +49,7 @@ class Mutex {
  private:
   pthread_mutex_t mutex_;
 
-  MOJO_DISALLOW_COPY_AND_ASSIGN(Mutex);
+  DISALLOW_COPY_AND_ASSIGN(Mutex);
 };
 
 class MutexLock {
@@ -59,7 +60,7 @@ class MutexLock {
  private:
   Mutex* const mutex_;
 
-  MOJO_DISALLOW_COPY_AND_ASSIGN(MutexLock);
+  DISALLOW_COPY_AND_ASSIGN(MutexLock);
 };
 
 // Catch bug where variable name is omitted (e.g., |MutexLock (&mu)|).