Test X11 header pollution

media/gpu/ipc/service/media_channel.h

Index: media/gpu/ipc/service/media_channel.h
diff --git a/content/common/gpu/media/media_channel.h b/media/gpu/ipc/service/media_channel.h
similarity index 85%
rename from content/common/gpu/media/media_channel.h
rename to media/gpu/ipc/service/media_channel.h
index 49c1ee732421a388dca85498824ef8574b82ec6a..3c6c1b0ddf517c4511d09668907709b09a6e0367 100644
--- a/content/common/gpu/media/media_channel.h
+++ b/media/gpu/ipc/service/media_channel.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMMON_GPU_MEDIA_MEDIA_CHANNEL_H_
-#define CONTENT_COMMON_GPU_MEDIA_MEDIA_CHANNEL_H_
+#ifndef MEDIA_GPU_IPC_SERVICE_MEDIA_CHANNEL_H_
+#define MEDIA_GPU_IPC_SERVICE_MEDIA_CHANNEL_H_
 
 #include <memory>
 
-#include "content/common/gpu/media/gpu_jpeg_decode_accelerator.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
+#include "media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h"
 #include "media/video/video_decode_accelerator.h"
 
 namespace media {
@@ -21,7 +21,7 @@ class GpuChannel;
 class GpuCommandBufferStub;
 }
 
-namespace content {
+namespace media {
 
 class MediaChannelDispatchHelper;
 
@@ -54,6 +54,6 @@ class MediaChannel : public IPC::Listener, public IPC::Sender {
   DISALLOW_COPY_AND_ASSIGN(MediaChannel);
 };
 
-}  // namespace content
+}  // namespace media
 
-#endif  // CONTENT_COMMON_GPU_MEDIA_MEDIA_CHANNEL_H_
+#endif  // MEDIA_GPU_IPC_SERVICE_MEDIA_CHANNEL_H_