Test X11 header pollution

media/gpu/avda_codec_image.cc

Index: media/gpu/avda_codec_image.cc
diff --git a/content/common/gpu/media/avda_codec_image.cc b/media/gpu/avda_codec_image.cc
similarity index 98%
rename from content/common/gpu/media/avda_codec_image.cc
rename to media/gpu/avda_codec_image.cc
index d4a30fe34b744ef19e7fa0ebfb532b3a75a6e5ad..8fdb6f54a29e1de94ff9b16ff0f2d35f858e8814 100644
--- a/content/common/gpu/media/avda_codec_image.cc
+++ b/media/gpu/avda_codec_image.cc
@@ -2,23 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/gpu/media/avda_codec_image.h"
+#include "media/gpu/avda_codec_image.h"
 
 #include <string.h>
 
 #include <memory>
 
 #include "base/metrics/histogram_macros.h"
-#include "content/common/gpu/media/avda_shared_state.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/context_state.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/texture_manager.h"
+#include "media/gpu/avda_shared_state.h"
 #include "ui/gl/android/surface_texture.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/scoped_make_current.h"
 
-namespace content {
+namespace media {
 
 AVDACodecImage::AVDACodecImage(
     int picture_buffer_id,
@@ -284,4 +284,4 @@ bool AVDACodecImage::IsCodecBufferOutstanding() const {
   return codec_buffer_index_ != kInvalidCodecBufferIndex && media_codec_;
 }
 
-}  // namespace content
+}  // namespace media