Add the UI compositor to the Mac build

content/browser/compositor/software_browser_compositor_output_surface_unittest.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/message_loop/message_loop.h"
 #include "cc/output/compositor_frame.h"
-#include "content/browser/aura/browser_compositor_output_surface_proxy.h"
-#include "content/browser/aura/software_browser_compositor_output_surface.h"
+#include "content/browser/compositor/browser_compositor_output_surface_proxy.h"
+#include "content/browser/compositor/software_browser_compositor_output_surface.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/gfx/vsync_provider.h"
 #include "ui/gl/gl_implementation.h"
 
 namespace {
 
 class FakeVSyncProvider : public gfx::VSyncProvider {
  public:
   FakeVSyncProvider() : call_count_(0) {}
@@ skipping 119 matching lines @@
 
   FakeVSyncProvider* vsync_provider = static_cast<FakeVSyncProvider*>(
       output_surface_->software_device()->GetVSyncProvider());
   EXPECT_EQ(0, vsync_provider->call_count());
 
   cc::CompositorFrame frame;
   output_surface_->SwapBuffers(&frame);
 
   EXPECT_EQ(1, vsync_provider->call_count());
 }