Revert 245131 "Add the UI compositor to the Mac build", which caused Mac ASan redness

trunk/src/content/content_tests.gypi

 # Copyright (c) 2013 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.
 
 {
   'targets': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'dependencies': [
@@ skipping 259 matching lines @@
           ],
         }],
         ['use_glib == 1', {
           'dependencies': [
             '../build/linux/system.gyp:glib',
           ],
         }],
         ['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',
           ],
         }],
         ['OS!="android" and OS!="ios"', {
           'dependencies': [
             '../third_party/libvpx/libvpx.gyp:libvpx',
           ],
         }],
@@ skipping 29 matching lines @@
       ],
       'include_dirs': [
         '..',
         '<(SHARED_INTERMEDIATE_DIR)',  # Needed by key_systems_unittest.cc.
       ],
       'sources': [
         'browser/accessibility/browser_accessibility_mac_unittest.mm',
         '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',
         'browser/devtools/devtools_manager_unittest.cc',
         'browser/dom_storage/dom_storage_area_unittest.cc',
         'browser/dom_storage/dom_storage_context_impl_unittest.cc',
         'browser/dom_storage/dom_storage_database_unittest.cc',
         'browser/dom_storage/session_storage_database_unittest.cc',
         'browser/download/base_file_unittest.cc',
         'browser/download/download_file_unittest.cc',
@@ skipping 428 matching lines @@
         ['use_aura==1', {
           'dependencies': [
             '../ui/aura/aura.gyp:aura',
           ]
         }],
         ['use_aura==1 or toolkit_views==1', {
           'dependencies': [
             '../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',
           ],
           'sources!': [
             'browser/geolocation/network_location_provider_unittest.cc',
             'browser/geolocation/wifi_data_provider_chromeos_unittest.cc',
             'browser/geolocation/wifi_data_provider_common_unittest.cc',
             'browser/geolocation/wifi_data_provider_linux_unittest.cc',
           ],
@@ skipping 135 matching lines @@
           'includes': [
             'browser/gpu/test_support_gpu.gypi',
           ],
           'defines': [
             'HAS_OUT_OF_PROC_TEST_RUNNER',
           ],
           'sources': [
             'browser/accessibility/accessibility_win_browsertest.cc',
             'browser/accessibility/cross_platform_accessibility_browsertest.cc',
             'browser/accessibility/dump_accessibility_tree_browsertest.cc',
-            'browser/compositor/image_transport_factory_browsertest.cc',
+            'browser/aura/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',
             'browser/browser_plugin/test_browser_plugin_embedder.h',
             'browser/browser_plugin/test_browser_plugin_guest.cc',
             'browser/browser_plugin/test_browser_plugin_guest.h',
             'browser/browser_plugin/test_browser_plugin_guest_delegate.cc',
             'browser/browser_plugin/test_browser_plugin_guest_delegate.h',
             'browser/browser_plugin/test_browser_plugin_guest_manager.cc',
             'browser/browser_plugin/test_browser_plugin_guest_manager.h',
@@ skipping 136 matching lines @@
                 'content_shell',  # Needed for Content Shell.app's Helper.
               ],
               'sources': [
                 'renderer/external_popup_menu_browsertest.cc',
               ],
             }],
             ['use_aura==1', {
               'sources!': [
                 'browser/accessibility/accessibility_win_browsertest.cc',
               ],
+            }, {
+              'sources/': [
+                ['exclude', '^browser/aura/'],
+              ],
             }],
             ['use_aura==1 and OS!="win"', {
               'sources!': [
                 'browser/plugin_browsertest.cc',
               ],
             }],
             ['use_aura==1 or toolkit_views==1', {
               'dependencies': [
                 '../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': [
                 # Runtime dependencies
                 'copy_npapi_test_plugin',
               ],
             }],
             ['enable_webrtc==1', {
               'sources': [
                 'browser/media/webrtc_aecdump_browsertest.cc',
@@ skipping 499 matching lines @@
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }