Test X11 header pollution

media/gpu/v4l2_image_processor.h

Index: media/gpu/v4l2_image_processor.h
diff --git a/content/common/gpu/media/v4l2_image_processor.h b/media/gpu/v4l2_image_processor.h
similarity index 94%
rename from content/common/gpu/media/v4l2_image_processor.h
rename to media/gpu/v4l2_image_processor.h
index 1390da46d79806c71826f229a3b89f5e480cc858..e448a4d8939e48c32c13a60b81cf303956333601 100644
--- a/content/common/gpu/media/v4l2_image_processor.h
+++ b/media/gpu/v4l2_image_processor.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_IMAGE_PROCESSOR_H_
-#define CONTENT_COMMON_GPU_MEDIA_V4L2_IMAGE_PROCESSOR_H_
+#ifndef MEDIA_GPU_V4L2_IMAGE_PROCESSOR_H_
+#define MEDIA_GPU_V4L2_IMAGE_PROCESSOR_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -17,16 +17,16 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread.h"
-#include "content/common/content_export.h"
-#include "content/common/gpu/media/v4l2_device.h"
 #include "media/base/video_frame.h"
+#include "media/gpu/media_gpu_export.h"
+#include "media/gpu/v4l2_device.h"
 
-namespace content {
+namespace media {
 
 // Handles image processing accelerators that expose a V4L2 memory-to-memory
 // interface. The threading model of this class is the same as for other V4L2
 // hardware accelerators (see V4L2VideoDecodeAccelerator) for more details.
-class CONTENT_EXPORT V4L2ImageProcessor {
+class MEDIA_GPU_EXPORT V4L2ImageProcessor {
  public:
   explicit V4L2ImageProcessor(const scoped_refptr<V4L2Device>& device);
   virtual ~V4L2ImageProcessor();
@@ -180,8 +180,8 @@ class CONTENT_EXPORT V4L2ImageProcessor {
 
   // All the below members are to be accessed from device_thread_ only
   // (if it's running).
-  std::queue<linked_ptr<JobRecord> > input_queue_;
-  std::queue<linked_ptr<JobRecord> > running_jobs_;
+  std::queue<linked_ptr<JobRecord>> input_queue_;
+  std::queue<linked_ptr<JobRecord>> running_jobs_;
 
   // Input queue state.
   bool input_streamon_;
@@ -218,6 +218,6 @@ class CONTENT_EXPORT V4L2ImageProcessor {
   DISALLOW_COPY_AND_ASSIGN(V4L2ImageProcessor);
 };
 
-}  // namespace content
+}  // namespace media
 
-#endif  // CONTENT_COMMON_GPU_MEDIA_V4L2_IMAGE_PROCESSOR_H_
+#endif  // MEDIA_GPU_V4L2_IMAGE_PROCESSOR_H_