Add the UI compositor to the Mac build

content/content_browser.gypi

Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 612470c59475145046fc4c7046bdc978244e4992..1aacb9591e73692d326d8adaaeb274bef40fd95b 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -295,34 +295,6 @@
     'browser/appcache/appcache_frontend_proxy.h',
     'browser/appcache/chrome_appcache_service.cc',
     'browser/appcache/chrome_appcache_service.h',
-    'browser/aura/browser_compositor_output_surface.cc',
-    'browser/aura/browser_compositor_output_surface.h',
-    'browser/aura/browser_compositor_output_surface_proxy.cc',
-    'browser/aura/browser_compositor_output_surface_proxy.h',
-    'browser/aura/compositor_resize_lock.cc',
-    'browser/aura/compositor_resize_lock.h',
-    'browser/aura/gpu_process_transport_factory.cc',
-    'browser/aura/gpu_process_transport_factory.h',
-    'browser/aura/image_transport_factory.cc',
-    'browser/aura/image_transport_factory.h',
-    'browser/aura/no_transport_image_transport_factory.cc',
-    'browser/aura/no_transport_image_transport_factory.h',
-    'browser/aura/owned_mailbox.h',
-    'browser/aura/owned_mailbox.cc',
-    'browser/aura/reflector_impl.cc',
-    'browser/aura/reflector_impl.h',
-    'browser/aura/resize_lock.cc',
-    'browser/aura/resize_lock.h',
-    'browser/aura/gpu_browser_compositor_output_surface.cc',
-    'browser/aura/gpu_browser_compositor_output_surface.h',
-    'browser/aura/software_browser_compositor_output_surface.cc',
-    'browser/aura/software_browser_compositor_output_surface.h',
-    'browser/aura/software_output_device_ozone.cc',
-    'browser/aura/software_output_device_ozone.h',
-    'browser/aura/software_output_device_win.cc',
-    'browser/aura/software_output_device_win.h',
-    'browser/aura/software_output_device_x11.cc',
-    'browser/aura/software_output_device_x11.h',
     'browser/browser_child_process_host_impl.cc',
     'browser/browser_child_process_host_impl.h',
     'browser/browser_context.cc',
@@ -363,6 +335,32 @@
     'browser/child_process_launcher.h',
     'browser/child_process_security_policy_impl.cc',
     'browser/child_process_security_policy_impl.h',
+    'browser/compositor/browser_compositor_output_surface.cc',
+    'browser/compositor/browser_compositor_output_surface.h',
+    'browser/compositor/browser_compositor_output_surface_proxy.cc',
+    'browser/compositor/browser_compositor_output_surface_proxy.h',
+    'browser/compositor/gpu_process_transport_factory.cc',
+    'browser/compositor/gpu_process_transport_factory.h',
+    'browser/compositor/image_transport_factory.cc',
+    'browser/compositor/image_transport_factory.h',
+    'browser/compositor/no_transport_image_transport_factory.cc',
+    'browser/compositor/no_transport_image_transport_factory.h',
+    'browser/compositor/owned_mailbox.h',
+    'browser/compositor/owned_mailbox.cc',
+    'browser/compositor/reflector_impl.cc',
+    'browser/compositor/reflector_impl.h',
+    'browser/compositor/resize_lock.cc',
+    'browser/compositor/resize_lock.h',
+    'browser/compositor/gpu_browser_compositor_output_surface.cc',
+    'browser/compositor/gpu_browser_compositor_output_surface.h',
+    'browser/compositor/software_browser_compositor_output_surface.cc',
+    'browser/compositor/software_browser_compositor_output_surface.h',
+    'browser/compositor/software_output_device_ozone.cc',
+    'browser/compositor/software_output_device_ozone.h',
+    'browser/compositor/software_output_device_win.cc',
+    'browser/compositor/software_output_device_win.h',
+    'browser/compositor/software_output_device_x11.cc',
+    'browser/compositor/software_output_device_x11.h',
     'browser/cross_site_request_manager.cc',
     'browser/cross_site_request_manager.h',
     'browser/devtools/devtools_agent_host_impl.cc',
@@ -821,6 +819,8 @@
     'browser/renderer_host/compositing_iosurface_transformer_mac.h',
     'browser/renderer_host/compositor_impl_android.cc',
     'browser/renderer_host/compositor_impl_android.h',
+    'browser/renderer_host/compositor_resize_lock_aura.cc',
+    'browser/renderer_host/compositor_resize_lock_aura.h',
     'browser/renderer_host/database_message_filter.cc',
     'browser/renderer_host/database_message_filter.h',
     'browser/renderer_host/delegated_frame_evictor.cc',
@@ -1561,7 +1561,6 @@
       'dependencies': [
         '../ui/aura/aura.gyp:aura',
         '../ui/base/strings/ui_strings.gyp:ui_strings',
-        '../ui/compositor/compositor.gyp:compositor',
       ],
       'sources/': [
         ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.cc'],
@@ -1571,7 +1570,6 @@
       ],
     }, {
       'sources/': [
-        ['exclude', '^browser/aura/'],
         ['exclude', '^browser/renderer_host/input/touchpad_tap_suppression_controller_aura.cc'],
         ['exclude', '^browser/renderer_host/render_widget_host_view_aura.cc'],
         ['exclude', '^browser/renderer_host/render_widget_host_view_aura.h'],
@@ -1581,6 +1579,15 @@
         ['exclude', '^browser/renderer_host/ui_events_helper.h'],
       ],
     }],
+    ['use_aura==1 or OS=="mac"', {
+      'dependencies': [
+        '../ui/compositor/compositor.gyp:compositor',
+      ],
+    }, {
+      'sources/': [
+        ['exclude', '^browser/compositor/'],
+      ]
+    }],
     ['enable_plugins==1', {
       'dependencies': [
         '../ppapi/ppapi_internal.gyp:ppapi_ipc',