Test X11 header pollution

media/gpu/ipc/service/media_service.cc

Index: media/gpu/ipc/service/media_service.cc
diff --git a/content/common/gpu/media/media_service.cc b/media/gpu/ipc/service/media_service.cc
similarity index 78%
rename from content/common/gpu/media/media_service.cc
rename to media/gpu/ipc/service/media_service.cc
index 1fbd51e393a35bb792c859dd44b635005820e77d..a5e6d2194dc1e152a7408a13955576128d4225a4 100644
--- a/content/common/gpu/media/media_service.cc
+++ b/media/gpu/ipc/service/media_service.cc
@@ -2,20 +2,20 @@
 // 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/media_service.h"
+#include "media/gpu/ipc/service/media_service.h"
 
 #include <memory>
 #include <utility>
 
-#include "content/common/gpu/media/gpu_video_decode_accelerator.h"
-#include "content/common/gpu/media/gpu_video_encode_accelerator.h"
-#include "content/common/gpu/media/media_channel.h"
 #include "gpu/ipc/service/gpu_channel.h"
 #include "gpu/ipc/service/gpu_channel_manager.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/param_traits_macros.h"
+#include "media/gpu/ipc/service/gpu_video_decode_accelerator.h"
+#include "media/gpu/ipc/service/gpu_video_encode_accelerator.h"
+#include "media/gpu/ipc/service/media_channel.h"
 
-namespace content {
+namespace media {
 
 MediaService::MediaService(gpu::GpuChannelManager* channel_manager)
     : channel_manager_(channel_manager) {}
@@ -38,4 +38,4 @@ void MediaService::DestroyAllChannels() {
   media_channels_.clear();
 }
 
-}  // namespace content
+}  // namespace media