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

mojo/services/gfx/images/cpp/image_pipe_consumer_endpoint.h

 // Copyright 2016 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.
 #ifndef MOJO_SERVICES_GFX_IMAGES_INTERFACES_IMAGE_PIPE_CONSUMER_ENDPOINT_H_
 #define MOJO_SERVICES_GFX_IMAGES_INTERFACES_IMAGE_PIPE_CONSUMER_ENDPOINT_H_
 
 #include "image_pipe_endpoint.h"
-#include "mojo/public/c/system/macros.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/system/macros.h"
 #include "mojo/services/gfx/images/cpp/image_pipe_consumer_delegate.h"
 #include "mojo/services/gfx/images/interfaces/image_pipe.mojom.h"
 
 namespace image_pipe {
 
 // |ImagePipeConsumerEndpoint| is a state tracking wrapper for the consumer end
 // of an |ImagePipe| that enforces the constraints documented in the mojom
 // interface. Using |ImagePipeConsumerEndpoint| is not required to use
 // |ImagePipe|, but it may help you use it correctly
 class ImagePipeConsumerEndpoint : private mojo::gfx::ImagePipe {
@@ skipping 31 matching lines @@
   ImagePipeConsumerDelegate* delegate_;
 
   mojo::Binding<mojo::gfx::ImagePipe> image_pipe_binding_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ImagePipeConsumerEndpoint);
 };
 
 }  // namespace image_pipe
 
 #endif  // MOJO_SERVICES_GFX_IMAGES_INTERFACES_IMAGE_PIPE_CONSUMER_ENDPOINT_H_