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

mojo/public/cpp/bindings/tests/validation_test_input_parser.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/public/cpp/bindings/tests/validation_test_input_parser.h"
 
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <limits>
 #include <map>
 #include <set>
 #include <utility>
 
-#include "mojo/public/c/system/macros.h"
-
 namespace mojo {
 namespace test {
 namespace {
 
 class ValidationTestInputParser {
  public:
   ValidationTestInputParser(const std::string& input,
                             std::vector<uint8_t>* data,
                             size_t* num_handles,
                             std::string* error_message);
@@ skipping 373 matching lines @@
 bool ParseValidationTestInput(const std::string& input,
                               std::vector<uint8_t>* data,
                               size_t* num_handles,
                               std::string* error_message) {
   ValidationTestInputParser parser(input, data, num_handles, error_message);
   return parser.Run();
 }
 
 }  // namespace test
 }  // namespace mojo