Test X11 header pollution

media/gpu/ipc/service/gpu_jpeg_decode_accelerator.cc

Index: media/gpu/ipc/service/gpu_jpeg_decode_accelerator.cc
diff --git a/content/common/gpu/media/gpu_jpeg_decode_accelerator.cc b/media/gpu/ipc/service/gpu_jpeg_decode_accelerator.cc
similarity index 96%
rename from content/common/gpu/media/gpu_jpeg_decode_accelerator.cc
rename to media/gpu/ipc/service/gpu_jpeg_decode_accelerator.cc
index 00783178af510cce46142c924d8b2a57f78e8901..4dbc35facb8799ef09b5dad5b1be12f7cee60d26 100644
--- a/content/common/gpu/media/gpu_jpeg_decode_accelerator.cc
+++ b/media/gpu/ipc/service/gpu_jpeg_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_jpeg_decode_accelerator.h"
+#include "media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h"
 
 #include <stdint.h>
 
@@ -27,11 +27,11 @@
 
 #if defined(OS_CHROMEOS)
 #if defined(ARCH_CPU_X86_FAMILY)
-#include "content/common/gpu/media/vaapi_jpeg_decode_accelerator.h"
+#include "media/gpu/vaapi_jpeg_decode_accelerator.h"
 #endif
 #if defined(USE_V4L2_CODEC)
-#include "content/common/gpu/media/v4l2_device.h"
-#include "content/common/gpu/media/v4l2_jpeg_decode_accelerator.h"
+#include "media/gpu/v4l2_device.h"
+#include "media/gpu/v4l2_jpeg_decode_accelerator.h"
 #endif
 #endif
 
@@ -70,13 +70,13 @@ bool VerifyDecodeParams(const AcceleratedJpegDecoderMsg_Decode_Params& params) {
 
 }  // namespace
 
-namespace content {
+namespace media {
 
 class GpuJpegDecodeAccelerator::Client
     : public media::JpegDecodeAccelerator::Client,
       public base::NonThreadSafe {
  public:
-  Client(content::GpuJpegDecodeAccelerator* owner, int32_t route_id)
+  Client(media::GpuJpegDecodeAccelerator* owner, int32_t route_id)
       : owner_(owner->AsWeakPtr()), route_id_(route_id) {}
 
   ~Client() override { DCHECK(CalledOnValidThread()); }
@@ -110,7 +110,7 @@ class GpuJpegDecodeAccelerator::Client
   }
 
  private:
-  base::WeakPtr<content::GpuJpegDecodeAccelerator> owner_;
+  base::WeakPtr<media::GpuJpegDecodeAccelerator> owner_;
   int32_t route_id_;
   std::unique_ptr<media::JpegDecodeAccelerator> accelerator_;
 };
@@ -301,8 +301,7 @@ GpuJpegDecodeAccelerator::GpuJpegDecodeAccelerator(
     : channel_(channel),
       child_task_runner_(base::ThreadTaskRunnerHandle::Get()),
       io_task_runner_(io_task_runner),
-      client_number_(0) {
-}
+      client_number_(0) {}
 
 GpuJpegDecodeAccelerator::~GpuJpegDecodeAccelerator() {
   DCHECK(CalledOnValidThread());
@@ -390,8 +389,8 @@ GpuJpegDecodeAccelerator::CreateV4L2JDA(
     const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner) {
   std::unique_ptr<media::JpegDecodeAccelerator> decoder;
 #if defined(OS_CHROMEOS) && defined(USE_V4L2_CODEC)
-  scoped_refptr<V4L2Device> device = V4L2Device::Create(
-      V4L2Device::kJpegDecoder);
+  scoped_refptr<V4L2Device> device =
+      V4L2Device::Create(V4L2Device::kJpegDecoder);
   if (device)
     decoder.reset(new V4L2JpegDecodeAccelerator(device, io_task_runner));
 #endif
@@ -424,4 +423,4 @@ bool GpuJpegDecodeAccelerator::IsSupported() {
   return false;
 }
 
-}  // namespace content
+}  // namespace media