Test X11 header pollution

media/gpu/va_surface.h

Index: media/gpu/va_surface.h
diff --git a/content/common/gpu/media/va_surface.h b/media/gpu/va_surface.h
similarity index 93%
rename from content/common/gpu/media/va_surface.h
rename to media/gpu/va_surface.h
index 41c7880f8dd1010d696a059c1cd8c847efa452d9..c73bc57500815b79794bab4adec2a19b1b24da3f 100644
--- a/content/common/gpu/media/va_surface.h
+++ b/media/gpu/va_surface.h
@@ -5,17 +5,17 @@
 // This file contains the definition of VASurface class, used for decoding by
 // VaapiVideoDecodeAccelerator and VaapiH264Decoder.
 
-#ifndef CONTENT_COMMON_GPU_MEDIA_VA_SURFACE_H_
-#define CONTENT_COMMON_GPU_MEDIA_VA_SURFACE_H_
+#ifndef MEDIA_GPU_VA_SURFACE_H_
+#define MEDIA_GPU_VA_SURFACE_H_
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "content/common/content_export.h"
+#include "media/gpu/media_gpu_export.h"
 #include "third_party/libva/va/va.h"
 #include "ui/gfx/geometry/size.h"
 
-namespace content {
+namespace media {
 
 // A VA-API-specific decode surface used by VaapiH264Decoder to decode into
 // and use as reference for decoding other surfaces. It is also handed by the
@@ -83,7 +83,8 @@ namespace content {
 //                                       v
 //                       VaapiWrapper frees VASurfaceID.
 //
-class CONTENT_EXPORT VASurface : public base::RefCountedThreadSafe<VASurface> {
+class MEDIA_GPU_EXPORT VASurface
+    : public base::RefCountedThreadSafe<VASurface> {
  public:
   // Provided by user, will be called when all references to the surface
   // are released.
@@ -94,9 +95,7 @@ class CONTENT_EXPORT VASurface : public base::RefCountedThreadSafe<VASurface> {
             unsigned int format,
             const ReleaseCB& release_cb);
 
-  VASurfaceID id() {
-    return va_surface_id_;
-  }
+  VASurfaceID id() { return va_surface_id_; }
 
   const gfx::Size& size() const { return size_; }
   unsigned int format() const { return format_; }
@@ -113,6 +112,6 @@ class CONTENT_EXPORT VASurface : public base::RefCountedThreadSafe<VASurface> {
   DISALLOW_COPY_AND_ASSIGN(VASurface);
 };
 
-}  // namespace content
+}  // namespace media
 
-#endif  // CONTENT_COMMON_GPU_MEDIA_VA_SURFACE_H_
+#endif  // MEDIA_GPU_VA_SURFACE_H_