Test X11 header pollution

media/gpu/h264_decoder.h

Index: media/gpu/h264_decoder.h
diff --git a/content/common/gpu/media/h264_decoder.h b/media/gpu/h264_decoder.h
similarity index 95%
rename from content/common/gpu/media/h264_decoder.h
rename to media/gpu/h264_decoder.h
index 51c4f7d8fb44f0d2caa2447d2304e8d09910c4a6..fc0e6f870e90e967fdc9709f6308f5369fe6781e 100644
--- a/content/common/gpu/media/h264_decoder.h
+++ b/media/gpu/h264_decoder.h
@@ -2,8 +2,8 @@
 // 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_H264_DECODER_H_
-#define CONTENT_COMMON_GPU_MEDIA_H264_DECODER_H_
+#ifndef MEDIA_GPU_H264_DECODER_H_
+#define MEDIA_GPU_H264_DECODER_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -13,14 +13,14 @@
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "content/common/content_export.h"
-#include "content/common/gpu/media/accelerated_video_decoder.h"
-#include "content/common/gpu/media/h264_dpb.h"
 #include "media/base/limits.h"
 #include "media/filters/h264_parser.h"
+#include "media/gpu/accelerated_video_decoder.h"
+#include "media/gpu/h264_dpb.h"
+#include "media/gpu/media_gpu_export.h"
 #include "ui/gfx/geometry/size.h"
 
-namespace content {
+namespace media {
 
 // Clients of this class are expected to pass H264 Annex-B byte stream
 // and are expected to provide an implementation of H264Accelerator for
@@ -28,9 +28,9 @@ namespace content {
 //
 // This class must be created, called and destroyed on a single thread, and
 // does nothing internally on any other thread.
-class CONTENT_EXPORT H264Decoder : public AcceleratedVideoDecoder {
+class MEDIA_GPU_EXPORT H264Decoder : public AcceleratedVideoDecoder {
  public:
-  class CONTENT_EXPORT H264Accelerator {
+  class MEDIA_GPU_EXPORT H264Accelerator {
    public:
     H264Accelerator();
     virtual ~H264Accelerator();
@@ -103,7 +103,7 @@ class CONTENT_EXPORT H264Decoder : public AcceleratedVideoDecoder {
   H264Decoder(H264Accelerator* accelerator);
   ~H264Decoder() override;
 
-  // content::AcceleratedVideoDecoder implementation.
+  // media::AcceleratedVideoDecoder implementation.
   bool Flush() override WARN_UNUSED_RESULT;
   void Reset() override;
   void SetStream(const uint8_t* ptr, size_t size) override;
@@ -275,6 +275,6 @@ class CONTENT_EXPORT H264Decoder : public AcceleratedVideoDecoder {
   DISALLOW_COPY_AND_ASSIGN(H264Decoder);
 };
 
-}  // namespace content
+}  // namespace media
 
-#endif  // CONTENT_COMMON_GPU_MEDIA_H264_DECODER_H_
+#endif  // MEDIA_GPU_H264_DECODER_H_