Test X11 header pollution

media/gpu/gpu_video_decode_accelerator_factory_impl.h

Index: media/gpu/gpu_video_decode_accelerator_factory_impl.h
diff --git a/content/common/gpu/media/gpu_video_decode_accelerator_factory_impl.h b/media/gpu/gpu_video_decode_accelerator_factory_impl.h
similarity index 91%
rename from content/common/gpu/media/gpu_video_decode_accelerator_factory_impl.h
rename to media/gpu/gpu_video_decode_accelerator_factory_impl.h
index ea4c58cf4cbfe911030429d90fd3f2ccbd91bd6a..a005a1cc6602db89b11716a39334511d0d93ed2a 100644
--- a/content/common/gpu/media/gpu_video_decode_accelerator_factory_impl.h
+++ b/media/gpu/gpu_video_decode_accelerator_factory_impl.h
@@ -2,16 +2,16 @@
 // 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_FACTORY_IMPL_H_
-#define CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_DECODE_ACCELERATOR_FACTORY_IMPL_H_
+#ifndef MEDIA_GPU_GPU_VIDEO_DECODE_ACCELERATOR_FACTORY_IMPL_H_
+#define MEDIA_GPU_GPU_VIDEO_DECODE_ACCELERATOR_FACTORY_IMPL_H_
 
 #include <memory>
 
 #include "base/callback.h"
 #include "base/threading/thread_checker.h"
-#include "content/common/content_export.h"
 #include "gpu/command_buffer/service/gpu_preferences.h"
 #include "gpu/config/gpu_info.h"
+#include "media/gpu/media_gpu_export.h"
 #include "media/video/video_decode_accelerator.h"
 
 namespace gfx {
@@ -30,13 +30,13 @@ class GLES2Decoder;
 }
 }
 
-namespace content {
+namespace media {
 
 // TODO(posciak): this class should be an implementation of
 // content::GpuVideoDecodeAcceleratorFactory, however that can only be achieved
 // once this is moved out of content/common, see crbug.com/597150 and related.
-class CONTENT_EXPORT GpuVideoDecodeAcceleratorFactoryImpl {
-public:
+class MEDIA_GPU_EXPORT GpuVideoDecodeAcceleratorFactoryImpl {
+ public:
   ~GpuVideoDecodeAcceleratorFactoryImpl();
 
   // Return current GLContext.
@@ -122,6 +122,6 @@ public:
   DISALLOW_IMPLICIT_CONSTRUCTORS(GpuVideoDecodeAcceleratorFactoryImpl);
 };
 
-}  // namespace content
+}  // namespace media
 
-#endif  // CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_DECODE_ACCELERATOR_FACTORY_IMPL_H_
+#endif  // MEDIA_GPU_GPU_VIDEO_DECODE_ACCELERATOR_FACTORY_IMPL_H_