Add the UI compositor to the Mac build

content/content_tests.gypi

Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index cb4aea94d6ff88fa9a0bf4bbff1a41f13c6d82a7..1b0d7f44f1851ce58e021daeb3d686b97cee8a84 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -277,10 +277,14 @@
         ['use_aura==1', {
           'dependencies': [
             '../ui/aura/aura.gyp:aura_test_support',
-            '../ui/compositor/compositor.gyp:compositor',
             '../ui/resources/ui_resources.gyp:ui_test_pak',
           ],
         }],
+        ['use_aura==1 or OS=="mac"', {
+          'dependencies': [
+            '../ui/compositor/compositor.gyp:compositor',
+          ],
+        }],
         ['OS=="win"', {
           'dependencies': [
             '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
@@ -330,12 +334,12 @@
         'browser/accessibility/browser_accessibility_manager_unittest.cc',
         'browser/accessibility/browser_accessibility_win_unittest.cc',
         'browser/appcache/chrome_appcache_service_unittest.cc',
-        'browser/aura/software_browser_compositor_output_surface_unittest.cc',
-        'browser/aura/software_output_device_ozone_unittest.cc',
         'browser/browser_thread_unittest.cc',
         'browser/browser_url_handler_impl_unittest.cc',
         'browser/byte_stream_unittest.cc',
         'browser/child_process_security_policy_unittest.cc',
+        'browser/compositor/software_browser_compositor_output_surface_unittest.cc',
+        'browser/compositor/software_output_device_ozone_unittest.cc',
         'browser/device_orientation/data_fetcher_impl_android_unittest.cc',
         'browser/device_orientation/data_fetcher_shared_memory_base_unittest.cc',
         'browser/devtools/devtools_http_handler_unittest.cc',
@@ -786,6 +790,11 @@
             '../ui/events/events.gyp:events_test_support',
           ],
         }],
+        ['use_aura!=1 and OS!="mac"', {
+          'sources/': [
+            ['exclude', '^browser/compositor/'],
+          ],
+        }],
         ['OS == "android"', {
           'sources': [
             'browser/renderer_host/java/jni_helper_unittest.cc',
@@ -941,7 +950,7 @@
             'browser/accessibility/accessibility_win_browsertest.cc',
             'browser/accessibility/cross_platform_accessibility_browsertest.cc',
             'browser/accessibility/dump_accessibility_tree_browsertest.cc',
-            'browser/aura/image_transport_factory_browsertest.cc',
+            'browser/compositor/image_transport_factory_browsertest.cc',
             'browser/bookmarklet_browsertest.cc',
             'browser/browser_plugin/browser_plugin_host_browsertest.cc',
             'browser/browser_plugin/test_browser_plugin_embedder.cc',
@@ -1098,10 +1107,6 @@
               'sources!': [
                 'browser/accessibility/accessibility_win_browsertest.cc',
               ],
-            }, {
-              'sources/': [
-                ['exclude', '^browser/aura/'],
-              ],
             }],
             ['use_aura==1 and OS!="win"', {
               'sources!': [
@@ -1113,6 +1118,11 @@
                 '../ui/events/events.gyp:events_test_support',
               ],
             }],
+            ['use_aura!=1 and OS!="mac"', {
+              'sources/': [
+                ['exclude', '^browser/compositor/'],
+              ],
+            }],
             ['OS!="android" and OS!="ios"', {
               # npapi test plugin doesn't build on android or ios
               'dependencies': [