Simplify IOSurface CoreAnimation code: Part 2

content/content_browser.gypi

Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index e88c8546e4842a7fbd87cc0ca4cb8bcadfcf9f11..2ebe367df823a20ad02b1024161e188b5adf07d4 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -906,12 +906,6 @@
       'browser/renderer_host/clipboard_message_filter.cc',
       'browser/renderer_host/clipboard_message_filter.h',
       'browser/renderer_host/clipboard_message_filter_mac.mm',
-      'browser/renderer_host/compositing_iosurface_context_mac.h',
-      'browser/renderer_host/compositing_iosurface_context_mac.mm',
-      '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/compositor_impl_android.cc',
       'browser/renderer_host/compositor_impl_android.h',
       'browser/renderer_host/compositor_resize_lock_aura.cc',
@@ -1086,8 +1080,6 @@
       'browser/renderer_host/sandbox_ipc_linux.h',
       'browser/renderer_host/software_frame_manager.cc',
       'browser/renderer_host/software_frame_manager.h',
-      'browser/renderer_host/software_layer_mac.mm',
-      'browser/renderer_host/software_layer_mac.h',
       'browser/renderer_host/socket_stream_dispatcher_host.cc',
       'browser/renderer_host/socket_stream_dispatcher_host.h',
       'browser/renderer_host/socket_stream_host.cc',
@@ -1424,6 +1416,8 @@
       'browser/compositor/gpu_process_transport_factory.h',
       'browser/compositor/image_transport_factory.cc',
       'browser/compositor/image_transport_factory.h',
+      'browser/compositor/io_surface_layer_mac.h',
+      'browser/compositor/io_surface_layer_mac.mm',
       'browser/compositor/onscreen_display_client.cc',
       'browser/compositor/onscreen_display_client.h',
       'browser/compositor/overlay_candidate_validator_ozone.cc',
@@ -1438,6 +1432,8 @@
       '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_layer_mac.mm',
+      'browser/compositor/software_layer_mac.h',
       'browser/compositor/software_output_device_mac.mm',
       'browser/compositor/software_output_device_mac.h',
       'browser/compositor/software_output_device_ozone.cc',