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

trunk/src/content/content_browser.gypi

 # Copyright (c) 2012 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.
 
 {
   'dependencies': [
     '../base/base.gyp:base_static',
     '../crypto/crypto.gyp:crypto',
     '../google_apis/google_apis.gyp:google_apis',
     '../net/net.gyp:net',
@@ skipping 277 matching lines @@
     'browser/android/tracing_controller_android.cc',
     'browser/android/tracing_controller_android.h',
     'browser/android/web_contents_observer_android.cc',
     'browser/android/web_contents_observer_android.h',
     'browser/appcache/appcache_dispatcher_host.cc',
     'browser/appcache/appcache_dispatcher_host.h',
     'browser/appcache/appcache_frontend_proxy.cc',
     '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',
     'browser/browser_ipc_logging.cc',
     'browser/browser_main.cc',
     'browser/browser_main.h',
     'browser/browser_main_loop.cc',
     'browser/browser_main_loop.h',
     'browser/browser_main_runner.cc',
     'browser/browser_plugin/browser_plugin_embedder.cc',
@@ skipping 20 matching lines @@
     'browser/browsing_instance.cc',
     'browser/browsing_instance.h',
     'browser/byte_stream.cc',
     'browser/byte_stream.h',
     'browser/cert_store_impl.cc',
     'browser/cert_store_impl.h',
     'browser/child_process_launcher.cc',
     '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',
     'browser/devtools/devtools_agent_host_impl.h',
     'browser/devtools/devtools_browser_target.cc',
     'browser/devtools/devtools_browser_target.h',
     'browser/devtools/devtools_external_agent_proxy_impl.cc',
     'browser/devtools/devtools_external_agent_proxy_impl.h',
     'browser/devtools/devtools_frontend_host.cc',
     'browser/devtools/devtools_frontend_host.h',
@@ skipping 438 matching lines @@
     'browser/renderer_host/compositing_iosurface_layer_mac.h',
     'browser/renderer_host/compositing_iosurface_layer_mac.mm',
     'browser/renderer_host/compositing_iosurface_mac.h',
     'browser/renderer_host/compositing_iosurface_mac.mm',
     'browser/renderer_host/compositing_iosurface_shader_programs_mac.cc',
     'browser/renderer_host/compositing_iosurface_shader_programs_mac.h',
     'browser/renderer_host/compositing_iosurface_transformer_mac.cc',
     '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',
     'browser/renderer_host/delegated_frame_evictor.h',
     'browser/renderer_host/dip_util.cc',
     'browser/renderer_host/dip_util.h',
     'browser/renderer_host/file_utilities_message_filter.cc',
     'browser/renderer_host/file_utilities_message_filter.h',
     'browser/renderer_host/gamepad_browser_message_filter.cc',
     'browser/renderer_host/gamepad_browser_message_filter.h',
@@ skipping 720 matching lines @@
       ],
     }, {
       'sources!': [
         'browser/renderer_host/input/touchscreen_tap_suppression_controller_stub.cc',
       ],
     }],
     ['use_aura==1', {
       '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'],
         ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.h'],
         ['exclude', '^browser/renderer_host/input/touchpad_tap_suppression_controller.cc'],
         ['exclude', '^browser/renderer_host/native_web_keyboard_event_win.cc'],
       ],
     }, {
       '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'],
         ['exclude', '^browser/web_contents/touch_editable_impl_aura.cc'],
         ['exclude', '^browser/web_contents/touch_editable_impl_aura.h'],
         ['exclude', '^browser/renderer_host/ui_events_helper.cc'],
         ['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',
         '../ppapi/ppapi_internal.gyp:ppapi_shared',
       ],
     }, {  # enable_plugins==0
       'sources!': [
         'browser/pepper_flash_settings_helper_impl.cc',
         'browser/pepper_flash_settings_helper_impl.h',
         'browser/plugin_data_remover_impl.cc',
@@ skipping 34 matching lines @@
         '../build/linux/system.gyp:dbus',
         '../dbus/dbus.gyp:dbus',
       ],
     }, {  # OS != "linux" or use_dbus==0
       'sources!': [
         'browser/geolocation/wifi_data_provider_linux.cc',
       ],
     }],
   ],
 }