Test X11 header pollution

media/gpu/rendering_helper.h

Index: media/gpu/rendering_helper.h
diff --git a/content/common/gpu/media/rendering_helper.h b/media/gpu/rendering_helper.h
similarity index 96%
rename from content/common/gpu/media/rendering_helper.h
rename to media/gpu/rendering_helper.h
index 1fc592e219566aefde001d2a5b7e547be4f8ae88..029d5a40c345ef419e32de84a2df72a4c3d6bc7a 100644
--- a/content/common/gpu/media/rendering_helper.h
+++ b/media/gpu/rendering_helper.h
@@ -2,8 +2,8 @@
 // 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_RENDERING_HELPER_H_
-#define CONTENT_COMMON_GPU_MEDIA_RENDERING_HELPER_H_
+#ifndef MEDIA_GPU_RENDERING_HELPER_H_
+#define MEDIA_GPU_RENDERING_HELPER_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -32,7 +32,7 @@ namespace ui {
 class DisplayConfigurator;
 }
 
-namespace content {
+namespace media {
 
 class VideoFrameTexture : public base::RefCounted<VideoFrameTexture> {
  public:
@@ -86,7 +86,6 @@ struct RenderingHelperParams {
 // (except for ctor/dtor) ensure they're being run on a single thread.
 class RenderingHelper {
  public:
-
   RenderingHelper();
   ~RenderingHelper();
 
@@ -161,7 +160,7 @@ class RenderingHelper {
     int frames_to_drop;
 
     // The video frames pending for rendering.
-    std::queue<scoped_refptr<VideoFrameTexture> > pending_frames;
+    std::queue<scoped_refptr<VideoFrameTexture>> pending_frames;
 
     RenderedVideo();
     RenderedVideo(const RenderedVideo& other);
@@ -225,6 +224,6 @@ class RenderingHelper {
   DISALLOW_COPY_AND_ASSIGN(RenderingHelper);
 };
 
-}  // namespace content
+}  // namespace media
 
-#endif  // CONTENT_COMMON_GPU_MEDIA_RENDERING_HELPER_H_
+#endif  // MEDIA_GPU_RENDERING_HELPER_H_