Revert of Introduce components/display_compositor

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.
 
 {
   'variables': {
     'layouttest_support_content_sources': [
       'public/test/layouttest_support.h',
       'public/test/nested_message_pump_android.cc',
       'public/test/nested_message_pump_android.h',
@@ skipping 170 matching lines @@
       'test/web_gesture_curve_mock.h',
     ],
     'content_browsertests_sources': [
       'app/mojo/mojo_browsertest.cc',
       'browser/accessibility/accessibility_event_recorder.cc',
       'browser/accessibility/accessibility_event_recorder.h',
       'browser/accessibility/accessibility_event_recorder_mac.mm',
       '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',
       'browser/background_sync/background_sync_browsertest.cc',
       'browser/battery_status/battery_monitor_impl_browsertest.cc',
       'browser/battery_status/battery_monitor_integration_browsertest.cc',
       'browser/bookmarklet_browsertest.cc',
       'browser/browser_side_navigation_browsertest.cc',
       'browser/child_process_launcher_browsertest.cc',
       'browser/child_process_security_policy_browsertest.cc',
@@ skipping 172 matching lines @@
       'browser/browser_thread_unittest.cc',
       'browser/browser_url_handler_impl_unittest.cc',
       'browser/byte_stream_unittest.cc',
       'browser/cache_storage/cache_storage_blob_to_disk_cache_unittest.cc',
       'browser/cache_storage/cache_storage_cache_unittest.cc',
       'browser/cache_storage/cache_storage_manager_unittest.cc',
       'browser/cache_storage/cache_storage_scheduler_unittest.cc',
       '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',
       'browser/database_quota_client_unittest.cc',
       'browser/database_tracker_unittest.cc',
       'browser/database_util_unittest.cc',
       'browser/databases_table_unittest.cc',
       'browser/device_sensors/data_fetcher_shared_memory_base_unittest.cc',
       'browser/device_sensors/sensor_manager_android_unittest.cc',
       'browser/device_sensors/sensor_manager_chromeos_unittest.cc',
@@ skipping 427 matching lines @@
   },
   'targets': [
     {
       # GN version: //content/test:test_support
       'target_name': 'test_support_content',
       'type': 'static_library',
       'dependencies': [
         '../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',
         '../gpu/gpu.gyp:gpu_ipc_common',
         '../gpu/gpu.gyp:gpu_ipc_service_test_support',
         '../ipc/mojo/ipc_mojo.gyp:*',
         '../media/blink/media_blink.gyp:media_blink',
         '../media/media.gyp:media',
         '../media/midi/midi.gyp:midi',
         '../mojo/mojo_edk.gyp:mojo_common_test_support',
@@ skipping 682 matching lines @@
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/gfx/gfx.gyp:gfx_test_support',
         '../ui/gl/gl.gyp:gl',
         '../ui/gl/gl.gyp:gl_test_support',
         '../v8/tools/gyp/v8.gyp:v8',
       ],
       'include_dirs': [
         '..',
       ],
       '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',
       ],
       'conditions': [
         ['OS=="android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
         }, {
           'dependencies': [
             # Runtime dependencis.
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
             '../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',
+      ],
+    },
   ],
   'conditions': [
     ['test_isolation_mode != "noop"', {
       'targets': [
         {
           # GN: //content/test:content_site_isolation_browsertests_run
           'target_name': 'content_site_isolation_browsertests_run',
           'type': 'none',
           'dependencies': [
             'content_browsertests_run',
@@ skipping 607 matching lines @@
                   'content_unittests_apk.isolate',
                 ],
               },
             ],
           },
         ],
       ],
     }],
   ],
 }