Revert of Introduce components/display_compositor

content/content_browser.gypi

Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 63b46ea72678ec10eb2719ea663c7df375fccdbe..36c47125a8ff29bf89371a10cc46d6247b47a812 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -7,7 +7,6 @@
     '../base/base.gyp:base_static',
     '../cc/cc.gyp:cc',
     '../cc/cc.gyp:cc_surfaces',
-    '../components/components.gyp:display_compositor',
     '../components/leveldb/leveldb.gyp:leveldb_lib',
     '../components/mime_util/mime_util.gyp:mime_util',
     '../components/scheduler/scheduler.gyp:scheduler_common',
@@ -99,6 +98,7 @@
   'variables': {
     'public_browser_sources': [
       'public/browser/access_token_store.h',
+      'public/browser/android/service_registry_android.h',
       'public/browser/android/browser_media_player_manager_register.cc',
       'public/browser/android/browser_media_player_manager_register.h',
       'public/browser/android/compositor.h',
@@ -110,7 +110,6 @@
       'public/browser/android/download_controller_android.cc',
       'public/browser/android/download_controller_android.h',
       'public/browser/android/external_video_surface_container.h',
-      'public/browser/android/service_registry_android.h',
       'public/browser/android/synchronous_compositor.cc',
       'public/browser/android/synchronous_compositor.h',
       'public/browser/android/synchronous_compositor_client.h',
@@ -550,6 +549,12 @@
       # NOTE: These files are here instead of in compositor_browser_sources
       # because the latter is not built on Android, whereas these files are
       # needed on all platforms.
+      'browser/compositor/gl_helper.cc',
+      'browser/compositor/gl_helper.h',
+      'browser/compositor/gl_helper_readback_support.cc',
+      'browser/compositor/gl_helper_readback_support.h',
+      'browser/compositor/gl_helper_scaling.cc',
+      'browser/compositor/gl_helper_scaling.h',
       'browser/compositor/surface_utils.cc',
       'browser/compositor/surface_utils.h',
       'browser/device_sensors/ambient_light_mac.cc',
@@ -1060,8 +1065,8 @@
       'browser/media/capture/cursor_renderer.h',
       'browser/media/capture/cursor_renderer_aura.cc',
       'browser/media/capture/cursor_renderer_aura.h',
+      'browser/media/capture/cursor_renderer_mac.mm',
       'browser/media/capture/cursor_renderer_mac.h',
-      'browser/media/capture/cursor_renderer_mac.mm',
       'browser/media/capture/desktop_capture_device_uma_types.cc',
       'browser/media/capture/desktop_capture_device_uma_types.h',
       'browser/media/capture/web_contents_audio_input_stream.cc',
@@ -1606,8 +1611,8 @@
       'browser/web_contents/web_contents_view.h',
       'browser/web_contents/web_contents_view_aura.cc',
       'browser/web_contents/web_contents_view_aura.h',
+      'browser/web_contents/web_contents_view_child_frame.h',
       'browser/web_contents/web_contents_view_child_frame.cc',
-      'browser/web_contents/web_contents_view_child_frame.h',
       'browser/web_contents/web_contents_view_guest.cc',
       'browser/web_contents/web_contents_view_guest.h',
       'browser/web_contents/web_contents_view_mac.h',
@@ -1769,6 +1774,8 @@
       'browser/compositor/browser_compositor_overlay_candidate_validator_mac.mm',
       'browser/compositor/browser_compositor_overlay_candidate_validator_ozone.cc',
       'browser/compositor/browser_compositor_overlay_candidate_validator_ozone.h',
+      'browser/compositor/buffer_queue.cc',
+      'browser/compositor/buffer_queue.h',
       'browser/compositor/gpu_browser_compositor_output_surface.cc',
       'browser/compositor/gpu_browser_compositor_output_surface.h',
       'browser/compositor/gpu_process_transport_factory.cc',