Test X11 header pollution

media/gpu/android_video_decode_accelerator_unittest.cc

Index: media/gpu/android_video_decode_accelerator_unittest.cc
diff --git a/content/common/gpu/media/android_video_decode_accelerator_unittest.cc b/media/gpu/android_video_decode_accelerator_unittest.cc
similarity index 92%
rename from content/common/gpu/media/android_video_decode_accelerator_unittest.cc
rename to media/gpu/android_video_decode_accelerator_unittest.cc
index 2a10eea338b46a0fdf94aebe343dd7f48dbcb08b..69450136c3b18a816942c1f8cfe5b1f019d954e8 100644
--- a/content/common/gpu/media/android_video_decode_accelerator_unittest.cc
+++ b/media/gpu/android_video_decode_accelerator_unittest.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 <stdint.h>
 
@@ -12,11 +12,11 @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
-#include "content/common/gpu/media/android_copying_backing_strategy.h"
-#include "content/common/gpu/media/android_video_decode_accelerator.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"
 #include "media/base/android/media_codec_util.h"
 #include "media/base/android/media_jni_registrar.h"
+#include "media/gpu/android_copying_backing_strategy.h"
+#include "media/gpu/android_video_decode_accelerator.h"
 #include "media/video/picture.h"
 #include "media/video/video_decode_accelerator.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -35,7 +35,7 @@ static base::WeakPtr<gpu::gles2::GLES2Decoder> MockGetGLES2Decoder(
 
 }  // namespace
 
-namespace content {
+namespace media {
 
 class MockVideoDecodeAcceleratorClient
     : public media::VideoDecodeAccelerator::Client {
@@ -104,9 +104,9 @@ TEST_F(AndroidVideoDecodeAcceleratorTest, ConfigureSupportedCodec) {
   EXPECT_TRUE(Configure(media::kCodecVP8));
 }
 
-}  // namespace content
+}  // namespace media
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }