Test X11 header pollution

media/gpu/android_video_decode_accelerator.cc

Index: media/gpu/android_video_decode_accelerator.cc
diff --git a/content/common/gpu/media/android_video_decode_accelerator.cc b/media/gpu/android_video_decode_accelerator.cc
similarity index 98%
rename from content/common/gpu/media/android_video_decode_accelerator.cc
rename to media/gpu/android_video_decode_accelerator.cc
index 36c11c5e2e5dc8c1d3a3729894849fd52781dfea..f6b7178318127a2e80e5f487788c70daad1e162d 100644
--- a/content/common/gpu/media/android_video_decode_accelerator.cc
+++ b/media/gpu/android_video_decode_accelerator.cc
@@ -2,7 +2,7 @@
 // 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/android_video_decode_accelerator.h"
+#include "media/gpu/android_video_decode_accelerator.h"
 
 #include <stddef.h>
 
@@ -21,10 +21,6 @@
 #include "base/task_runner_util.h"
 #include "base/threading/thread_checker.h"
 #include "base/trace_event/trace_event.h"
-#include "content/common/gpu/media/android_copying_backing_strategy.h"
-#include "content/common/gpu/media/android_deferred_rendering_backing_strategy.h"
-#include "content/common/gpu/media/avda_return_on_failure.h"
-#include "content/common/gpu/media/shared_memory_region.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
 #include "gpu/ipc/service/gpu_channel.h"
@@ -36,6 +32,10 @@
 #include "media/base/media.h"
 #include "media/base/timestamp_constants.h"
 #include "media/base/video_decoder_config.h"
+#include "media/gpu/android_copying_backing_strategy.h"
+#include "media/gpu/android_deferred_rendering_backing_strategy.h"
+#include "media/gpu/avda_return_on_failure.h"
+#include "media/gpu/shared_memory_region.h"
 #include "media/video/picture.h"
 #include "ui/gl/android/scoped_java_surface.h"
 #include "ui/gl/android/surface_texture.h"
@@ -51,7 +51,7 @@
     PostError(FROM_HERE, media::VideoDecodeAccelerator::error_code); \
   } while (0)
 
-namespace content {
+namespace media {
 
 enum { kNumPictureBuffers = media::limits::kMaxVideoFrames + 1 };
 
@@ -64,18 +64,17 @@ enum { kMaxBitstreamsNotifiedInAdvance = 32 };
 // MediaCodec fail when decoding if it's not actually supported. It's assumed
 // that consumers won't have software fallback for H264 on Android anyway.
 static const media::VideoCodecProfile kSupportedH264Profiles[] = {
-  media::H264PROFILE_BASELINE,
-  media::H264PROFILE_MAIN,
-  media::H264PROFILE_EXTENDED,
-  media::H264PROFILE_HIGH,
-  media::H264PROFILE_HIGH10PROFILE,
-  media::H264PROFILE_HIGH422PROFILE,
-  media::H264PROFILE_HIGH444PREDICTIVEPROFILE,
-  media::H264PROFILE_SCALABLEBASELINE,
-  media::H264PROFILE_SCALABLEHIGH,
-  media::H264PROFILE_STEREOHIGH,
-  media::H264PROFILE_MULTIVIEWHIGH
-};
+    media::H264PROFILE_BASELINE,
+    media::H264PROFILE_MAIN,
+    media::H264PROFILE_EXTENDED,
+    media::H264PROFILE_HIGH,
+    media::H264PROFILE_HIGH10PROFILE,
+    media::H264PROFILE_HIGH422PROFILE,
+    media::H264PROFILE_HIGH444PREDICTIVEPROFILE,
+    media::H264PROFILE_SCALABLEBASELINE,
+    media::H264PROFILE_SCALABLEHIGH,
+    media::H264PROFILE_STEREOHIGH,
+    media::H264PROFILE_MULTIVIEWHIGH};
 
 // Because MediaCodec is thread-hostile (must be poked on a single thread) and
 // has no callback mechanism (b/11990118), we must drive it by polling for
@@ -1465,4 +1464,4 @@ AndroidVideoDecodeAccelerator::GetCapabilities(
   return capabilities;
 }
 
-}  // namespace content
+}  // namespace media