Change the canonical way to include the C macros.h to <mojo/macros.h>.

mojo/edk/system/options_validation_unittest.cc

 // 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.
 
 #include "mojo/edk/system/options_validation.h"
 
+#include <mojo/macros.h>
 #include <stddef.h>
 #include <stdint.h>
 
-#include "mojo/public/c/system/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace system {
 namespace {
 
 // Declare a test options struct just as we do in actual public headers.
 
 using TestOptionsFlags = uint32_t;
 
@@ skipping 100 matching lines @@
                                    : reinterpret_cast<TestOptions*>(&buffer[0]);
         options->struct_size = static_cast<uint32_t>(sizeof(TestOptions));
         UserOptionsReader<TestOptions> reader(MakeUserPointer(options));
       },
       kMemoryCheckFailedRegex);
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo