Test X11 header pollution

media/gpu/avda_surface_tracker.cc

 // Copyright 2016 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 "content/common/gpu/media/avda_surface_tracker.h"
+#include "media/gpu/avda_surface_tracker.h"
 
 #include "base/callback.h"
 #include "base/lazy_instance.h"
 #include "base/threading/thread_checker.h"
 
-namespace content {
+namespace media {
 
 namespace {
 static base::LazyInstance<AVDASurfaceTracker> g_lazy_instance =
     LAZY_INSTANCE_INITIALIZER;
 }
 
 AVDASurfaceTracker::AVDASurfaceTracker() {}
 
 AVDASurfaceTracker::~AVDASurfaceTracker() {}
 
@@ skipping 17 matching lines @@
 void AVDASurfaceTracker::NotifyDestroyingSurface(int surface_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   for (const auto& cb : callbacks_)
     cb.Run(surface_id);
 }
 
 AVDASurfaceTracker* AVDASurfaceTracker::GetInstance() {
   return g_lazy_instance.Pointer();
 }
 
-}  // namespace content
+}  // namespace media