Test X11 header pollution

media/gpu/gpu_video_decode_accelerator_helpers.h

Index: media/gpu/gpu_video_decode_accelerator_helpers.h
diff --git a/content/common/gpu/media/gpu_video_decode_accelerator_helpers.h b/media/gpu/gpu_video_decode_accelerator_helpers.h
similarity index 86%
rename from content/common/gpu/media/gpu_video_decode_accelerator_helpers.h
rename to media/gpu/gpu_video_decode_accelerator_helpers.h
index 1717f5926035adec6640d6bfc63945d5a49b3c34..9d3fda582a5be0157922ddb30d032ed832334201 100644
--- a/content/common/gpu/media/gpu_video_decode_accelerator_helpers.h
+++ b/media/gpu/gpu_video_decode_accelerator_helpers.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_GPU_VIDEO_DECODE_ACCELERATOR_HELPERS_H_
-#define CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_DECODE_ACCELERATOR_HELPERS_H_
+#ifndef MEDIA_GPU_GPU_VIDEO_DECODE_ACCELERATOR_HELPERS_H_
+#define MEDIA_GPU_GPU_VIDEO_DECODE_ACCELERATOR_HELPERS_H_
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
@@ -22,7 +22,7 @@ class GLES2Decoder;
 }
 }
 
-namespace content {
+namespace media {
 
 // Helpers/defines for specific VideoDecodeAccelerator implementations in GPU
 // process. Which callbacks are required depends on the implementation.
@@ -54,6 +54,6 @@ using BindGLImageCallback =
 using GetGLES2DecoderCallback =
     base::Callback<base::WeakPtr<gpu::gles2::GLES2Decoder>(void)>;
 
-}  // namespace content
+}  // namespace media
 
-#endif  // CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_DECODE_ACCELERATOR_HELPERS_H_
+#endif  // MEDIA_GPU_GPU_VIDEO_DECODE_ACCELERATOR_HELPERS_H_