Test X11 header pollution

media/gpu/ipc/service/gpu_video_decode_accelerator.cc

Index: media/gpu/ipc/service/gpu_video_decode_accelerator.cc
diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/media/gpu/ipc/service/gpu_video_decode_accelerator.cc
similarity index 97%
rename from content/common/gpu/media/gpu_video_decode_accelerator.cc
rename to media/gpu/ipc/service/gpu_video_decode_accelerator.cc
index f35291e48ae22d45f7bc284517b2f58e581c0ab9..18a17de2725e456f53a3ba4c121cd2632c177619 100644
--- a/content/common/gpu/media/gpu_video_decode_accelerator.cc
+++ b/media/gpu/ipc/service/gpu_video_decode_accelerator.cc
@@ -2,7 +2,7 @@
 // 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/gpu_video_decode_accelerator.h"
+#include "media/gpu/ipc/service/gpu_video_decode_accelerator.h"
 
 #include <memory>
 #include <vector>
@@ -15,7 +15,6 @@
 #include "base/stl_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "build/build_config.h"
-#include "content/common/gpu/media/gpu_video_decode_accelerator_factory_impl.h"
 #include "gpu/command_buffer/common/command_buffer.h"
 #include "gpu/command_buffer/service/gpu_preferences.h"
 #include "gpu/ipc/service/gpu_channel.h"
@@ -24,13 +23,14 @@
 #include "ipc/ipc_message_utils.h"
 #include "ipc/message_filter.h"
 #include "media/base/limits.h"
-#include "media/gpu/ipc/common/gpu_video_accelerator_util.h"
+#include "media/gpu/gpu_video_accelerator_util.h"
+#include "media/gpu/gpu_video_decode_accelerator_factory_impl.h"
 #include "media/gpu/ipc/common/media_messages.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_image.h"
 
-namespace content {
+namespace media {
 
 namespace {
 static gfx::GLContext* GetGLContext(
@@ -251,8 +251,7 @@ void GpuVideoDecodeAccelerator::DismissPictureBuffer(
   uncleared_textures_.erase(picture_buffer_id);
 }
 
-void GpuVideoDecodeAccelerator::PictureReady(
-    const media::Picture& picture) {
+void GpuVideoDecodeAccelerator::PictureReady(const media::Picture& picture) {
   // VDA may call PictureReady on IO thread. SetTextureCleared should run on
   // the child thread. VDA is responsible to call PictureReady on the child
   // thread when a picture buffer is delivered the first time.
@@ -294,8 +293,8 @@ void GpuVideoDecodeAccelerator::NotifyResetDone() {
 
 void GpuVideoDecodeAccelerator::NotifyError(
     media::VideoDecodeAccelerator::Error error) {
-  if (!Send(new AcceleratedVideoDecoderHostMsg_ErrorNotification(
-          host_route_id_, error))) {
+  if (!Send(new AcceleratedVideoDecoderHostMsg_ErrorNotification(host_route_id_,
+                                                                 error))) {
     DLOG(ERROR) << "Send(AcceleratedVideoDecoderHostMsg_ErrorNotification) "
                 << "failed";
   }
@@ -524,4 +523,4 @@ void GpuVideoDecodeAccelerator::SetTextureCleared(
   uncleared_textures_.erase(it);
 }
 
-}  // namespace content
+}  // namespace media