Add the UI compositor to the Mac build

content/browser/compositor/image_transport_factory_browsertest.cc

-// 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"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/compositor/compositor.h"
 
 namespace content {
 namespace {
 
 class ImageTransportFactoryBrowserTest : public ContentBrowserTest {
  public:
   ImageTransportFactoryBrowserTest() {}
 
   virtual void SetUp() OVERRIDE {
     UseRealGLContexts();
     ContentBrowserTest::SetUp();
   }
 };
 
 class MockImageTransportFactoryObserver : public ImageTransportFactoryObserver {
  public:
   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;
 
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
   scoped_refptr<ui::Texture> texture = factory->CreateTransportClient(1.f);
   ASSERT_TRUE(texture.get());
 
   MockImageTransportFactoryObserver observer;
   factory->AddObserver(&observer);
@@ skipping 14 matching lines @@
   gl->Flush();
 
   run_loop.Run();
   EXPECT_EQ(0u, texture->PrepareTexture());
 
   factory->RemoveObserver(&observer);
 }
 
 }  // anonymous namespace
 }  // namespace content