Test X11 header pollution

media/gpu/vaapi_jpeg_decode_accelerator.cc

Index: media/gpu/vaapi_jpeg_decode_accelerator.cc
diff --git a/content/common/gpu/media/vaapi_jpeg_decode_accelerator.cc b/media/gpu/vaapi_jpeg_decode_accelerator.cc
similarity index 96%
rename from content/common/gpu/media/vaapi_jpeg_decode_accelerator.cc
rename to media/gpu/vaapi_jpeg_decode_accelerator.cc
index fc25553d586a39be9559bbae93a3ed3b0cc9ca14..d2885732b9ac08140b8485ae8aa207d22c484b80 100644
--- a/content/common/gpu/media/vaapi_jpeg_decode_accelerator.cc
+++ b/media/gpu/vaapi_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/vaapi_jpeg_decode_accelerator.h"
+#include "media/gpu/vaapi_jpeg_decode_accelerator.h"
 
 #include <stddef.h>
 #include <string.h>
@@ -15,26 +15,25 @@
 #include "base/metrics/histogram.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
-#include "content/common/gpu/media/shared_memory_region.h"
-#include "content/common/gpu/media/vaapi_picture.h"
 #include "gpu/ipc/service/gpu_channel.h"
 #include "media/base/video_frame.h"
 #include "media/filters/jpeg_parser.h"
+#include "media/gpu/shared_memory_region.h"
+#include "media/gpu/vaapi_picture.h"
 #include "third_party/libyuv/include/libyuv.h"
 
-namespace content {
+namespace media {
 
 namespace {
 // UMA errors that the VaapiJpegDecodeAccelerator class reports.
 enum VAJDADecoderFailure {
   VAAPI_ERROR = 0,
-  // UMA requires that max must be greater than 1.
-  VAJDA_DECODER_FAILURES_MAX = 2,
+  VAJDA_DECODER_FAILURES_MAX,
 };
 
 static void ReportToUMA(VAJDADecoderFailure failure) {
   UMA_HISTOGRAM_ENUMERATION("Media.VAJDA.DecoderFailure", failure,
-                            VAJDA_DECODER_FAILURES_MAX);
+                            VAJDA_DECODER_FAILURES_MAX + 1);
 }
 
 static unsigned int VaSurfaceFormatForJpeg(
@@ -86,8 +85,7 @@ VaapiJpegDecodeAccelerator::DecodeRequest::DecodeRequest(
       shm(std::move(shm)),
       video_frame(video_frame) {}
 
-VaapiJpegDecodeAccelerator::DecodeRequest::~DecodeRequest() {
-}
+VaapiJpegDecodeAccelerator::DecodeRequest::~DecodeRequest() {}
 
 void VaapiJpegDecodeAccelerator::NotifyError(int32_t bitstream_buffer_id,
                                              Error error) {
@@ -321,4 +319,4 @@ bool VaapiJpegDecodeAccelerator::IsSupported() {
   return VaapiWrapper::IsJpegDecodeSupported();
 }
 
-}  // namespace content
+}  // namespace media