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

mojo/edk/system/memory_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/memory.h"
 
+#include <mojo/macros.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
 
-#include "mojo/public/c/system/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace system {
 namespace {
 
 TEST(MemoryTest, Valid) {
   char my_char;
   int32_t my_int32;
   int64_t my_int64_array[5] = {};  // Zero initialize.
@@ skipping 262 matching lines @@
     EXPECT_DEATH_IF_SUPPORTED(ptr.GetArray(&x, kTooBig),
                               kMemoryCheckFailedRegex);
   }
 
   // TODO(vtl): Tests for |UserPointer{Reader,Writer,ReaderWriter}|.
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo