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

mojo/services/gfx/images/cpp/image_pipe_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_CPP_IMAGE_PIPE_ENDPOINT_H_
 #define MOJO_SERVICES_GFX_IMAGES_CPP_IMAGE_PIPE_ENDPOINT_H_
 
 #include <deque>
 #include <string>
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
 
-#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 {
 
 class ImagePipeEndpoint {
  public:
   ImagePipeEndpoint(bool is_producer,
                     std::function<void()> fatal_error_handler);
   virtual ~ImagePipeEndpoint();
 
@@ skipping 43 matching lines @@
 
   // images that have been aquired by the producer
   std::unordered_set<uint32_t> producer_owned_ids_;
   // images that have been released by the producer but have not been aquired
   // by the consumer
   std::deque<uint32_t> producer_acquirable_ids_;
 
   bool is_producer_;
   bool is_checked_;
   std::function<void()> fatal_error_handler_;
+
+  MOJO_DISALLOW_COPY_AND_ASSIGN(ImagePipeEndpoint);
 };
-}
+
+}  // namespace image_pipe
 
 #endif  // MOJO_SERVICES_GFX_IMAGES_CPP_IMAGE_PIPE_ENDPOINT_H_