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

mojo/services/gfx/images/cpp/image_pipe_producer_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_PRODUCER_ENDPOINT_H_
 #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 {
 
 // This class wraps the producer end of an ImagePipe and validates the sanity
 // of both the producer actions and the consumer actions coming over the
 // message pipe. It also tracks the state of Images in the pipe's image pool
 // and provides conviennce mechanisms for accessing this state (like the ability
 // to get the ID of an available image without having to manually track the
 // lifecycle of these images.
@@ skipping 36 matching lines @@
   // This exists wrap ImagePipeEndpoint::ConsumerRelease because for some reason
   // GCC doesnt like us calling protected methods on our base class from inside
   // a lambda that captures 'this', which breaks the fnl build. Clang handles it
   // fine, but its unclear whos right here, so we trampoline it as a workaround
   void ConsumerReleaseInternal(uint32_t id,
                                mojo::gfx::PresentationStatus status);
 
   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_