Test X11 header pollution

media/gpu/v4l2_slice_video_decode_accelerator.h

Index: media/gpu/v4l2_slice_video_decode_accelerator.h
diff --git a/content/common/gpu/media/v4l2_slice_video_decode_accelerator.h b/media/gpu/v4l2_slice_video_decode_accelerator.h
similarity index 96%
rename from content/common/gpu/media/v4l2_slice_video_decode_accelerator.h
rename to media/gpu/v4l2_slice_video_decode_accelerator.h
index f917e1a4e3bcc7a3cefb63412bb9fe8c7553d14f..645672b3285c42e704f598f46b3a3bb3ac5f1638 100644
--- a/content/common/gpu/media/v4l2_slice_video_decode_accelerator.h
+++ b/media/gpu/v4l2_slice_video_decode_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_V4L2_SLICE_VIDEO_DECODE_ACCELERATOR_H_
-#define CONTENT_COMMON_GPU_MEDIA_V4L2_SLICE_VIDEO_DECODE_ACCELERATOR_H_
+#ifndef MEDIA_GPU_V4L2_SLICE_VIDEO_DECODE_ACCELERATOR_H_
+#define MEDIA_GPU_V4L2_SLICE_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <linux/videodev2.h>
 #include <stddef.h>
@@ -20,20 +20,20 @@
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/waitable_event.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/h264_decoder.h"
-#include "content/common/gpu/media/v4l2_device.h"
-#include "content/common/gpu/media/vp8_decoder.h"
+#include "media/gpu/gpu_video_decode_accelerator_helpers.h"
+#include "media/gpu/h264_decoder.h"
+#include "media/gpu/media_gpu_export.h"
+#include "media/gpu/v4l2_device.h"
+#include "media/gpu/vp8_decoder.h"
 #include "media/video/video_decode_accelerator.h"
 
-namespace content {
+namespace media {
 
 // An implementation of VideoDecodeAccelerator that utilizes the V4L2 slice
 // level codec API for decoding. The slice level API provides only a low-level
 // decoding functionality and requires userspace to provide support for parsing
 // the input stream and managing decoder state across frames.
-class CONTENT_EXPORT V4L2SliceVideoDecodeAccelerator
+class MEDIA_GPU_EXPORT V4L2SliceVideoDecodeAccelerator
     : public media::VideoDecodeAccelerator {
  public:
   class V4L2DecodeSurface;
@@ -64,7 +64,7 @@ class CONTENT_EXPORT V4L2SliceVideoDecodeAccelerator
   media::VideoPixelFormat GetOutputFormat() const override;
 
   static media::VideoDecodeAccelerator::SupportedProfiles
-      GetSupportedProfiles();
+  GetSupportedProfiles();
 
  private:
   class V4L2H264Accelerator;
@@ -468,6 +468,6 @@ class CONTENT_EXPORT V4L2SliceVideoDecodeAccelerator
 class V4L2H264Picture;
 class V4L2VP8Picture;
 
-}  // namespace content
+}  // namespace media
 
-#endif  // CONTENT_COMMON_GPU_MEDIA_V4L2_SLICE_VIDEO_DECODE_ACCELERATOR_H_
+#endif  // MEDIA_GPU_V4L2_SLICE_VIDEO_DECODE_ACCELERATOR_H_