Test X11 header pollution

media/gpu/tegra_v4l2_device.cc

Index: media/gpu/tegra_v4l2_device.cc
diff --git a/content/common/gpu/media/tegra_v4l2_device.cc b/media/gpu/tegra_v4l2_device.cc
similarity index 95%
rename from content/common/gpu/media/tegra_v4l2_device.cc
rename to media/gpu/tegra_v4l2_device.cc
index 6efe16f18892d08b0f24625c0eb8e84f801efc21..25b1c6a5180c8ff481ab9bc72d324c3d9a005929 100644
--- a/content/common/gpu/media/tegra_v4l2_device.cc
+++ b/media/gpu/tegra_v4l2_device.cc
@@ -9,10 +9,10 @@
 #include "base/lazy_instance.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/trace_event/trace_event.h"
-#include "content/common/gpu/media/tegra_v4l2_device.h"
+#include "media/gpu/tegra_v4l2_device.h"
 #include "ui/gl/gl_bindings.h"
 
-namespace content {
+namespace media {
 
 namespace {
 const char kDecoderDevice[] = "/dev/tegra_avpchannel";
@@ -93,9 +93,7 @@ base::LazyInstance<TegraFunctionSymbolFinder> g_tegra_function_symbol_finder_ =
     LAZY_INSTANCE_INITIALIZER;
 
 TegraV4L2Device::TegraV4L2Device(Type type)
-    : V4L2Device(type),
-      device_fd_(-1) {
-}
+    : V4L2Device(type), device_fd_(-1) {}
 
 TegraV4L2Device::~TegraV4L2Device() {
   if (device_fd_ != -1) {
@@ -205,11 +203,8 @@ EGLImageKHR TegraV4L2Device::CreateEGLImage(
 
   EGLint attr = EGL_NONE;
   EGLImageKHR egl_image =
-      eglCreateImageKHR(egl_display,
-                        egl_context,
-                        EGL_GL_TEXTURE_2D_KHR,
-                        reinterpret_cast<EGLClientBuffer>(texture_id),
-                        &attr);
+      eglCreateImageKHR(egl_display, egl_context, EGL_GL_TEXTURE_2D_KHR,
+                        reinterpret_cast<EGLClientBuffer>(texture_id), &attr);
   if (egl_image == EGL_NO_IMAGE_KHR) {
     LOG(ERROR) << "Unable to create EGL image";
     return egl_image;
@@ -227,7 +222,9 @@ EGLBoolean TegraV4L2Device::DestroyEGLImage(EGLDisplay egl_display,
   return eglDestroyImageKHR(egl_display, egl_image);
 }
 
-GLenum TegraV4L2Device::GetTextureTarget() { return GL_TEXTURE_2D; }
+GLenum TegraV4L2Device::GetTextureTarget() {
+  return GL_TEXTURE_2D;
+}
 
 uint32_t TegraV4L2Device::PreferredInputFormat() {
   // TODO(posciak): We should support "dontcare" returns here once we
@@ -236,4 +233,4 @@ uint32_t TegraV4L2Device::PreferredInputFormat() {
   return V4L2_PIX_FMT_YUV420M;
 }
 
-}  //  namespace content
+}  //  namespace media