Test X11 header pollution

media/gpu/vp8_decoder.cc

Index: media/gpu/vp8_decoder.cc
diff --git a/content/common/gpu/media/vp8_decoder.cc b/media/gpu/vp8_decoder.cc
similarity index 95%
rename from content/common/gpu/media/vp8_decoder.cc
rename to media/gpu/vp8_decoder.cc
index eed6b59a1436fdaa37eb0221c89419b15ab12aa4..9f315c46e5ca99588fc44c3b9fbdef5b0b8d213a 100644
--- a/content/common/gpu/media/vp8_decoder.cc
+++ b/media/gpu/vp8_decoder.cc
@@ -2,16 +2,14 @@
 // 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/vp8_decoder.h"
+#include "media/gpu/vp8_decoder.h"
 #include "media/base/limits.h"
 
-namespace content {
+namespace media {
 
-VP8Decoder::VP8Accelerator::VP8Accelerator() {
-}
+VP8Decoder::VP8Accelerator::VP8Accelerator() {}
 
-VP8Decoder::VP8Accelerator::~VP8Accelerator() {
-}
+VP8Decoder::VP8Accelerator::~VP8Accelerator() {}
 
 VP8Decoder::VP8Decoder(VP8Accelerator* accelerator)
     : state_(kNeedStreamMetadata),
@@ -21,8 +19,7 @@ VP8Decoder::VP8Decoder(VP8Accelerator* accelerator)
   DCHECK(accelerator_);
 }
 
-VP8Decoder::~VP8Decoder() {
-}
+VP8Decoder::~VP8Decoder() {}
 
 bool VP8Decoder::Flush() {
   DVLOG(2) << "Decoder flush";
@@ -194,4 +191,4 @@ size_t VP8Decoder::GetRequiredNumOfPictures() const {
   return kVP8NumFramesActive + kPicsInPipeline;
 }
 
-}  // namespace content
+}  // namespace media