Test X11 header pollution

media/gpu/vaapi_video_decode_accelerator.h

Index: media/gpu/vaapi_video_decode_accelerator.h
diff --git a/content/common/gpu/media/vaapi_video_decode_accelerator.h b/media/gpu/vaapi_video_decode_accelerator.h
similarity index 95%
rename from content/common/gpu/media/vaapi_video_decode_accelerator.h
rename to media/gpu/vaapi_video_decode_accelerator.h
index 9f2b66bcc96d3fc61b041b9fa7bfbd3c7b649747..f2db9896a76de2e596ea639c04eb2d2c916ca8cf 100644
--- a/content/common/gpu/media/vaapi_video_decode_accelerator.h
+++ b/media/gpu/vaapi_video_decode_accelerator.h
@@ -5,8 +5,8 @@
 // This file contains an implementation of VideoDecoderAccelerator
 // that utilizes hardware video decoder present on Intel CPUs.
 
-#ifndef CONTENT_COMMON_GPU_MEDIA_VAAPI_VIDEO_DECODE_ACCELERATOR_H_
-#define CONTENT_COMMON_GPU_MEDIA_VAAPI_VIDEO_DECODE_ACCELERATOR_H_
+#ifndef MEDIA_GPU_VAAPI_VIDEO_DECODE_ACCELERATOR_H_
+#define MEDIA_GPU_VAAPI_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -26,11 +26,11 @@
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
-#include "content/common/content_export.h"
-#include "content/common/gpu/media/gpu_video_decode_accelerator_helpers.h"
-#include "content/common/gpu/media/shared_memory_region.h"
-#include "content/common/gpu/media/vaapi_wrapper.h"
 #include "media/base/bitstream_buffer.h"
+#include "media/gpu/gpu_video_decode_accelerator_helpers.h"
+#include "media/gpu/media_gpu_export.h"
+#include "media/gpu/shared_memory_region.h"
+#include "media/gpu/vaapi_wrapper.h"
 #include "media/video/picture.h"
 #include "media/video/video_decode_accelerator.h"
 
@@ -38,7 +38,7 @@ namespace gl {
 class GLImage;
 }
 
-namespace content {
+namespace media {
 
 class AcceleratedVideoDecoder;
 class VaapiPicture;
@@ -51,7 +51,7 @@ class VaapiPicture;
 // ChildThread.  A few methods on it are called on the decoder thread which is
 // stopped during |this->Destroy()|, so any tasks posted to the decoder thread
 // can assume |*this| is still alive.  See |weak_this_| below for more details.
-class CONTENT_EXPORT VaapiVideoDecodeAccelerator
+class MEDIA_GPU_EXPORT VaapiVideoDecodeAccelerator
     : public media::VideoDecodeAccelerator {
  public:
   class VaapiDecodeSurface;
@@ -77,7 +77,7 @@ class CONTENT_EXPORT VaapiVideoDecodeAccelerator
       override;
 
   static media::VideoDecodeAccelerator::SupportedProfiles
-      GetSupportedProfiles();
+  GetSupportedProfiles();
 
  private:
   class VaapiH264Accelerator;
@@ -215,7 +215,7 @@ class CONTENT_EXPORT VaapiVideoDecodeAccelerator
   };
 
   // Queue for incoming input buffers.
-  typedef std::queue<linked_ptr<InputBuffer> > InputBuffers;
+  typedef std::queue<linked_ptr<InputBuffer>> InputBuffers;
   InputBuffers input_buffers_;
   // Signalled when input buffers are queued onto the input_buffers_ queue.
   base::ConditionVariable input_ready_;
@@ -317,6 +317,6 @@ class CONTENT_EXPORT VaapiVideoDecodeAccelerator
   DISALLOW_COPY_AND_ASSIGN(VaapiVideoDecodeAccelerator);
 };
 
-}  // namespace content
+}  // namespace media
 
-#endif  // CONTENT_COMMON_GPU_MEDIA_VAAPI_VIDEO_DECODE_ACCELERATOR_H_
+#endif  // MEDIA_GPU_VAAPI_VIDEO_DECODE_ACCELERATOR_H_