Revert 245131 "Add the UI compositor to the Mac build", which caused Mac ASan redness

trunk/src/content/public/test/browser_test_base.cc

 // Copyright (c) 2011 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/public/test/browser_test_base.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 19 matching lines @@
 #include "base/power_monitor/power_monitor_device_source.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "base/threading/thread_restrictions.h"
 #include "content/public/browser/browser_main_runner.h"
 #include "content/public/browser/browser_thread.h"
 #endif
 
 #if defined(USE_AURA)
-#include "content/browser/compositor/image_transport_factory.h"
+#include "content/browser/aura/image_transport_factory.h"
 #include "ui/compositor/test/test_context_factory.h"
 #endif
 
 namespace content {
 namespace {
 
 #if defined(OS_POSIX)
 // On SIGTERM (sent by the runner on timeouts), dump a stack trace (to make
 // debugging easier) and also exit with a known error code (so that the test
 // framework considers this a failure -- http://crbug.com/57578).
@@ skipping 245 matching lines @@
 #if !defined(USE_AURA) && !defined(OS_MACOSX)
   // TODO(danakj): Remove when GTK linux is no more.
   NOTREACHED();
 #endif
 
   DCHECK(allow_osmesa_) << "Can't use GL with software compositing";
   use_software_compositing_ = true;
 }
 
 }  // namespace content