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

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

Index: mojo/services/gfx/images/cpp/image_pipe_producer_endpoint.h
diff --git a/mojo/services/gfx/images/cpp/image_pipe_producer_endpoint.h b/mojo/services/gfx/images/cpp/image_pipe_producer_endpoint.h
index d2cbbf976885f0fdc64ca2379efc6d3aa92c607e..8c3aa4397439706d22360ce1cf65bd51c2c2609c 100644
--- a/mojo/services/gfx/images/cpp/image_pipe_producer_endpoint.h
+++ b/mojo/services/gfx/images/cpp/image_pipe_producer_endpoint.h
@@ -6,7 +6,7 @@
 #define MOJO_SERVICES_GFX_IMAGES_INTERFACES_IMAGE_PIPE_PRODUCER_ENDPOINT_H_
 
 #include "image_pipe_endpoint.h"
-#include "mojo/public/c/system/macros.h"
+#include "mojo/public/cpp/system/macros.h"
 #include "mojo/services/gfx/images/interfaces/image_pipe.mojom.h"
 
 namespace image_pipe {
@@ -63,8 +63,10 @@ class ImagePipeProducerEndpoint : public mojo::gfx::ImagePipe {
   ImagePipeEndpoint state_tracker_;
   mojo::gfx::ImagePipePtr image_pipe_ptr_;
   std::function<void()> endpoint_closed_callback_;
+
+  MOJO_DISALLOW_COPY_AND_ASSIGN(ImagePipeProducerEndpoint);
 };
 
 }  // namespace image_pipe
 
-#endif  // MOJO_SERVICES_GFX_IMAGES_INTERFACES_IMAGE_PIPE_PRODUCER_ENDPOINT_H_
+#endif  // MOJO_SERVICES_GFX_IMAGES_INTERFACES_IMAGE_PIPE_PRODUCER_ENDPOINT_H_