Test X11 header pollution

media/gpu/vp8_decoder.h

Index: media/gpu/vp8_decoder.h
diff --git a/content/common/gpu/media/vp8_decoder.h b/media/gpu/vp8_decoder.h
similarity index 88%
rename from content/common/gpu/media/vp8_decoder.h
rename to media/gpu/vp8_decoder.h
index 50b3d1c47fc70e25d1df457f25626bb02754175e..32ca48b32717bef20e27f0fbe02070d83ff9adef 100644
--- a/content/common/gpu/media/vp8_decoder.h
+++ b/media/gpu/vp8_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_VP8_DECODER_H_
-#define CONTENT_COMMON_GPU_MEDIA_VP8_DECODER_H_
+#ifndef MEDIA_GPU_VP8_DECODER_H_
+#define MEDIA_GPU_VP8_DECODER_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -12,11 +12,11 @@
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "content/common/gpu/media/accelerated_video_decoder.h"
-#include "content/common/gpu/media/vp8_picture.h"
 #include "media/filters/vp8_parser.h"
+#include "media/gpu/accelerated_video_decoder.h"
+#include "media/gpu/vp8_picture.h"
 
-namespace content {
+namespace media {
 
 // Clients of this class are expected to pass raw VP8 stream and are expected
 // to provide an implementation of VP8Accelerator for offloading final steps
@@ -24,9 +24,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 VP8Decoder : public AcceleratedVideoDecoder {
+class MEDIA_GPU_EXPORT VP8Decoder : public AcceleratedVideoDecoder {
  public:
-  class CONTENT_EXPORT VP8Accelerator {
+  class MEDIA_GPU_EXPORT VP8Accelerator {
    public:
     VP8Accelerator();
     virtual ~VP8Accelerator();
@@ -66,7 +66,7 @@ class CONTENT_EXPORT VP8Decoder : public AcceleratedVideoDecoder {
   VP8Decoder(VP8Accelerator* accelerator);
   ~VP8Decoder() 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;
@@ -107,6 +107,6 @@ class CONTENT_EXPORT VP8Decoder : public AcceleratedVideoDecoder {
   DISALLOW_COPY_AND_ASSIGN(VP8Decoder);
 };
 
-}  // namespace content
+}  // namespace media
 
-#endif  // CONTENT_COMMON_GPU_MEDIA_VP8_DECODER_H_
+#endif  // MEDIA_GPU_VP8_DECODER_H_