Test X11 header pollution

media/gpu/vaapi_jpeg_decoder_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdint.h>
 #include <string.h>
 
 #include <string>
 
 // This has to be included first.
 // See http://code.google.com/p/googletest/issues/detail?id=371
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/md5.h"
 #include "base/path_service.h"
 #include "base/strings/string_piece.h"
-#include "content/common/gpu/media/vaapi_jpeg_decoder.h"
 #include "media/base/test_data_util.h"
 #include "media/base/video_frame.h"
 #include "media/filters/jpeg_parser.h"
+#include "media/gpu/vaapi_jpeg_decoder.h"
 
-namespace content {
+namespace media {
 namespace {
 
 const char* kTestFilename = "pixel-1280x720.jpg";
 const char* kExpectedMd5Sum = "6e9e1716073c9a9a1282e3f0e0dab743";
 
 void LogOnError() {
   LOG(FATAL) << "Oh noes! Decoder failed";
 }
 
 class VaapiJpegDecoderTest : public ::testing::Test {
@@ skipping 87 matching lines @@
 
   std::vector<VASurfaceID> va_surfaces;
   ASSERT_TRUE(
       wrapper_->CreateSurfaces(VA_RT_FORMAT_YUV420, size, 1, &va_surfaces));
 
   EXPECT_FALSE(
       VaapiJpegDecoder::Decode(wrapper_.get(), parse_result, va_surfaces[0]));
 }
 
 }  // namespace
-}  // namespace content
+}  // namespace media
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
   base::AtExitManager exit_manager;
-  content::VaapiWrapper::PreSandboxInitialization();
+  media::VaapiWrapper::PreSandboxInitialization();
   return RUN_ALL_TESTS();
 }