Add the UI compositor to the Mac build

content/browser/compositor/image_transport_factory_browsertest.cc

Index: content/browser/compositor/image_transport_factory_browsertest.cc
diff --git a/content/browser/aura/image_transport_factory_browsertest.cc b/content/browser/compositor/image_transport_factory_browsertest.cc
similarity index 83%
rename from content/browser/aura/image_transport_factory_browsertest.cc
rename to content/browser/compositor/image_transport_factory_browsertest.cc
index bf770a7e85725553aae5f5b03dfa527d2ee9ebd7..6551154621bc7702d5bcd056197cfe761cb0a531 100644
--- a/content/browser/aura/image_transport_factory_browsertest.cc
+++ b/content/browser/compositor/image_transport_factory_browsertest.cc
@@ -1,10 +1,10 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 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 "base/run_loop.h"
 #include "cc/output/context_provider.h"
-#include "content/browser/aura/image_transport_factory.h"
+#include "content/browser/compositor/image_transport_factory.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/test/content_browser_test.h"
 #include "gpu/GLES2/gl2extchromium.h"
@@ -30,9 +30,17 @@ class MockImageTransportFactoryObserver : public ImageTransportFactoryObserver {
   MOCK_METHOD0(OnLostResources, void());
 };
 
+// This crashes on Mac ASAN
+// http://crbug.com/335083
+#if defined(OS_MACOSX)
+#define MAYBE_TestLostContext DISABLED_TestLostContext
+#else
+#define MAYBE_TestLostContext TestLostContext
+#endif
 // Checks that upon context loss, the observer is called and the created
 // resources are reset.
-IN_PROC_BROWSER_TEST_F(ImageTransportFactoryBrowserTest, TestLostContext) {
+IN_PROC_BROWSER_TEST_F(ImageTransportFactoryBrowserTest,
+                       MAYBE_TestLostContext) {
   // This test doesn't make sense in software compositing mode.
   if (!GpuDataManager::GetInstance()->CanUseGpuBrowserCompositor())
     return;