Test X11 header pollution

media/gpu/vaapi_video_encode_accelerator.h

Index: media/gpu/vaapi_video_encode_accelerator.h
diff --git a/content/common/gpu/media/vaapi_video_encode_accelerator.h b/media/gpu/vaapi_video_encode_accelerator.h
similarity index 92%
rename from content/common/gpu/media/vaapi_video_encode_accelerator.h
rename to media/gpu/vaapi_video_encode_accelerator.h
index 8a4c88cc43ae8186289f436ed8985f5aa1c05447..1d5fb9d161ff06bde94cecade20d1e3643eb528d 100644
--- a/content/common/gpu/media/vaapi_video_encode_accelerator.h
+++ b/media/gpu/vaapi_video_encode_accelerator.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMMON_GPU_MEDIA_VAAPI_VIDEO_ENCODE_ACCELERATOR_H_
-#define CONTENT_COMMON_GPU_MEDIA_VAAPI_VIDEO_ENCODE_ACCELERATOR_H_
+#ifndef MEDIA_GPU_VAAPI_VIDEO_ENCODE_ACCELERATOR_H_
+#define MEDIA_GPU_VAAPI_VIDEO_ENCODE_ACCELERATOR_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -15,19 +15,19 @@
 #include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/threading/thread.h"
-#include "content/common/content_export.h"
-#include "content/common/gpu/media/h264_dpb.h"
-#include "content/common/gpu/media/va_surface.h"
-#include "content/common/gpu/media/vaapi_wrapper.h"
 #include "media/filters/h264_bitstream_buffer.h"
+#include "media/gpu/h264_dpb.h"
+#include "media/gpu/media_gpu_export.h"
+#include "media/gpu/va_surface.h"
+#include "media/gpu/vaapi_wrapper.h"
 #include "media/video/video_encode_accelerator.h"
 
-namespace content {
+namespace media {
 
 // A VideoEncodeAccelerator implementation that uses VA-API
 // (http://www.freedesktop.org/wiki/Software/vaapi) for HW-accelerated
 // video encode.
-class CONTENT_EXPORT VaapiVideoEncodeAccelerator
+class MEDIA_GPU_EXPORT VaapiVideoEncodeAccelerator
     : public media::VideoEncodeAccelerator {
  public:
   VaapiVideoEncodeAccelerator();
@@ -50,7 +50,7 @@ class CONTENT_EXPORT VaapiVideoEncodeAccelerator
 
  private:
   // Reference picture list.
-  typedef std::list<scoped_refptr<VASurface> > RefPicList;
+  typedef std::list<scoped_refptr<VASurface>> RefPicList;
 
   // Encode job for one frame. Created when an input frame is awaiting and
   // enough resources are available to proceed. Once the job is prepared and
@@ -232,13 +232,13 @@ class CONTENT_EXPORT VaapiVideoEncodeAccelerator
   VASurface::ReleaseCB va_surface_release_cb_;
 
   // VideoFrames passed from the client, waiting to be encoded.
-  std::queue<linked_ptr<InputFrameRef> > encoder_input_queue_;
+  std::queue<linked_ptr<InputFrameRef>> encoder_input_queue_;
 
   // BitstreamBuffers mapped, ready to be filled.
-  std::queue<linked_ptr<BitstreamBufferRef> > available_bitstream_buffers_;
+  std::queue<linked_ptr<BitstreamBufferRef>> available_bitstream_buffers_;
 
   // Jobs submitted for encode, awaiting bitstream buffers to become available.
-  std::queue<linked_ptr<EncodeJob> > submitted_encode_jobs_;
+  std::queue<linked_ptr<EncodeJob>> submitted_encode_jobs_;
 
   // Encoder thread. All tasks are executed on it.
   base::Thread encoder_thread_;
@@ -262,6 +262,6 @@ class CONTENT_EXPORT VaapiVideoEncodeAccelerator
   DISALLOW_COPY_AND_ASSIGN(VaapiVideoEncodeAccelerator);
 };
 
-}  // namespace content
+}  // namespace media
 
-#endif  // CONTENT_COMMON_GPU_MEDIA_VAAPI_VIDEO_ENCODE_ACCELERATOR_H_
+#endif  // MEDIA_GPU_VAAPI_VIDEO_ENCODE_ACCELERATOR_H_