Revert of Introduce components/display_compositor

content/content_tests.gypi

Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 9cd0b674c941a27cc68121f52c01aebcb9049796..bdf7859e87ead9729a86ec231a4de8c5cb8e59f7 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -188,12 +188,12 @@
       'browser/accessibility/accessibility_event_recorder_win.cc',
       'browser/accessibility/accessibility_ipc_error_browsertest.cc',
       'browser/accessibility/accessibility_mode_browsertest.cc',
+      'browser/accessibility/hit_testing_browsertest.cc',
       'browser/accessibility/cross_platform_accessibility_browsertest.cc',
       'browser/accessibility/dump_accessibility_browsertest_base.cc',
       'browser/accessibility/dump_accessibility_browsertest_base.h',
       'browser/accessibility/dump_accessibility_events_browsertest.cc',
       'browser/accessibility/dump_accessibility_tree_browsertest.cc',
-      'browser/accessibility/hit_testing_browsertest.cc',
       'browser/accessibility/site_per_process_accessibility_browsertest.cc',
       'browser/accessibility/snapshot_ax_tree_browsertest.cc',
       'browser/accessibility/touch_accessibility_aura_browsertest.cc',
@@ -386,6 +386,7 @@
       'browser/cache_storage/cache_storage_unittest.cc',
       'browser/child_process_security_policy_unittest.cc',
       'browser/cocoa/system_hotkey_map_unittest.mm',
+      'browser/compositor/buffer_queue_unittest.cc',
       'browser/compositor/reflector_impl_unittest.cc',
       'browser/compositor/software_browser_compositor_output_surface_unittest.cc',
       'browser/compositor/software_output_device_ozone_unittest.cc',
@@ -832,7 +833,6 @@
         '../cc/blink/cc_blink.gyp:cc_blink',
         '../cc/cc.gyp:cc',
         '../cc/cc_tests.gyp:cc_test_support',
-        '../components/components.gyp:display_compositor',
         '../components/scheduler/scheduler.gyp:scheduler',
         '../components/scheduler/scheduler.gyp:scheduler_test_support',
         '../gpu/blink/gpu_blink.gyp:gpu_blink',
@@ -1535,6 +1535,8 @@
         '..',
       ],
       'sources': [
+        'browser/compositor/gl_helper_unittest.cc',
+        'browser/compositor/yuv_readback_unittest.cc',
         'common/gpu/client/gpu_context_tests.h',
         'common/gpu/client/gpu_in_process_context_tests.cc',
         'test/run_all_gl_tests.cc',
@@ -1551,6 +1553,30 @@
             '../third_party/mesa/mesa.gyp:osmesa',
           ],
         }],
+      ],
+    },
+    {
+      # GN version: //content/test:content_gl_benchmark
+      'target_name': 'content_gl_benchmark',
+      'type': '<(gtest_target_type)',
+      'dependencies': [
+        'content.gyp:content_common',
+        'test_support_content',
+        '../base/base.gyp:test_support_base',
+        '../testing/gtest.gyp:gtest',
+        '../third_party/WebKit/public/blink.gyp:blink',
+        '../ui/base/ui_base.gyp:ui_base',
+        '../ui/gfx/gfx.gyp:gfx',
+        '../ui/gfx/gfx.gyp:gfx_geometry',
+        '../ui/gl/gl.gyp:gl',
+        '../ui/gl/gl.gyp:gl_test_support',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'browser/compositor/gl_helper_benchmark.cc',
+        'test/run_gl_benchmark.cc',
       ],
     },
   ],