Test X11 header pollution

media/gpu/vaapi_picture.cc

Index: media/gpu/vaapi_picture.cc
diff --git a/content/common/gpu/media/vaapi_picture.cc b/media/gpu/vaapi_picture.cc
similarity index 82%
rename from content/common/gpu/media/vaapi_picture.cc
rename to media/gpu/vaapi_picture.cc
index cdf8c355974c815a7ce7b198bfaff91f72c3d633..9e205907f96582889d4016053df13da35812639e 100644
--- a/content/common/gpu/media/vaapi_picture.cc
+++ b/media/gpu/vaapi_picture.cc
@@ -2,18 +2,18 @@
 // 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/vaapi_picture.h"
-#include "content/common/gpu/media/vaapi_wrapper.h"
+#include "media/gpu/vaapi_picture.h"
+#include "media/gpu/vaapi_wrapper.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_implementation.h"
 
 #if defined(USE_X11)
-#include "content/common/gpu/media/vaapi_tfp_picture.h"
+#include "media/gpu/vaapi_tfp_picture.h"
 #elif defined(USE_OZONE)
-#include "content/common/gpu/media/vaapi_drm_picture.h"
+#include "media/gpu/vaapi_drm_picture.h"
 #endif
 
-namespace content {
+namespace media {
 
 // static
 linked_ptr<VaapiPicture> VaapiPicture::CreatePicture(
@@ -50,4 +50,4 @@ uint32_t VaapiPicture::GetGLTextureTarget() {
 #endif
 }
 
-}  // namespace content
+}  // namespace media