Test X11 header pollution

media/gpu/avda_codec_image.h

Index: media/gpu/avda_codec_image.h
diff --git a/content/common/gpu/media/avda_codec_image.h b/media/gpu/avda_codec_image.h
similarity index 95%
rename from content/common/gpu/media/avda_codec_image.h
rename to media/gpu/avda_codec_image.h
index 43506bed1ec2eae70d10566b373640e74abd5a3d..317c7478a2696fe04e275e3ff4188fa51d9b31ef 100644
--- a/content/common/gpu/media/avda_codec_image.h
+++ b/media/gpu/avda_codec_image.h
@@ -2,22 +2,22 @@
 // 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_AVDA_CODEC_IMAGE_H_
-#define CONTENT_COMMON_GPU_MEDIA_AVDA_CODEC_IMAGE_H_
+#ifndef MEDIA_GPU_AVDA_CODEC_IMAGE_H_
+#define MEDIA_GPU_AVDA_CODEC_IMAGE_H_
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/macros.h"
-#include "content/common/gpu/media/avda_shared_state.h"
 #include "gpu/command_buffer/service/gl_stream_texture_image.h"
+#include "media/gpu/avda_shared_state.h"
 
 namespace ui {
 class ScopedMakeCurrent;
 }
 
-namespace content {
+namespace media {
 
 // GLImage that renders MediaCodec buffers to a SurfaceTexture or SurfaceView as
 // needed in order to draw them.
@@ -165,6 +165,6 @@ class AVDACodecImage : public gpu::gles2::GLStreamTextureImage {
   DISALLOW_COPY_AND_ASSIGN(AVDACodecImage);
 };
 
-}  // namespace content
+}  // namespace media
 
-#endif  // CONTENT_COMMON_GPU_MEDIA_AVDA_CODEC_IMAGE_H_
+#endif  // MEDIA_GPU_AVDA_CODEC_IMAGE_H_