Add the UI compositor to the Mac build

content/browser/compositor/software_browser_compositor_output_surface.h

-// 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.
 
-#ifndef CONTENT_BROWSER_AURA_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
-#define CONTENT_BROWSER_AURA_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
+#ifndef CONTENT_BROWSER_COMPOSITOR_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
+#define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
 
 #include "base/memory/weak_ptr.h"
-#include "content/browser/aura/browser_compositor_output_surface.h"
+#include "content/browser/compositor/browser_compositor_output_surface.h"
 #include "content/common/content_export.h"
 #include "ui/compositor/compositor.h"
 
 namespace base {
 class MessageLoopProxy;
 }
 
 namespace cc {
 class SoftwareOutputDevice;
 }
@@ skipping 20 matching lines @@
 
   // On the software path we need to explicitly call the proxy to update the
   // VSync parameters.
   scoped_refptr<BrowserCompositorOutputSurfaceProxy> output_surface_proxy_;
 
   DISALLOW_COPY_AND_ASSIGN(SoftwareBrowserCompositorOutputSurface);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_AURA_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
+#endif  // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_