Remove MOJO_DISALLOW_COPY_AND_ASSIGN and MOJO_ALLOW_UNUSED_LOCAL.

mojo/public/cpp/environment/lib/scoped_task_tracking.h

Index: mojo/public/cpp/environment/lib/scoped_task_tracking.h
diff --git a/mojo/public/cpp/environment/lib/scoped_task_tracking.h b/mojo/public/cpp/environment/lib/scoped_task_tracking.h
index b6e32c1760ad5cff2c9041e2e3674151ac3fc7de..4a8fb4f3de817dfe45812deef7380e0779cab57d 100644
--- a/mojo/public/cpp/environment/lib/scoped_task_tracking.h
+++ b/mojo/public/cpp/environment/lib/scoped_task_tracking.h
@@ -5,8 +5,8 @@
 #ifndef MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_SCOPED_TASK_TRACKING_H_
 #define MOJO_PUBLIC_CPP_ENVIRONMENT_LIB_SCOPED_TASK_TRACKING_H_
 
+#include "base/macros.h"
 #include "mojo/public/cpp/environment/task_tracker.h"
-#include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
 namespace internal {
@@ -25,7 +25,7 @@ class ScopedTaskTracking {
 
  private:
   TaskTrackingId id_;
-  MOJO_DISALLOW_COPY_AND_ASSIGN(ScopedTaskTracking);
+  DISALLOW_COPY_AND_ASSIGN(ScopedTaskTracking);
 };
 
 }  // namespace internal