Revert of Introduce components/display_compositor

content/test/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build_overrides/v8.gni")
@@ skipping 32 matching lines @@
     "//third_party/WebKit/public:test_support",
   ]
   deps = [
     ":browsertest_base",
     ":content_test_mojo_bindings",
     "//base/third_party/dynamic_annotations",
     "//cc",
     "//cc:test_support",
     "//cc/blink",
     "//cc/surfaces",
-    "//components/display_compositor",
     "//components/scheduler:scheduler",
     "//components/scheduler:test_support",
     "//content/app:both_for_content_tests",
     "//content/browser/speech/proto",
     "//content/child:for_content_tests",
     "//content/gpu",
     "//content/public/browser",
     "//content/public/child",
     "//content/public/renderer",
     "//content/public/utility",
@@ skipping 575 matching lines @@
   configs += [ "//build/config:precompiled_headers" ]
 
   deps = [
     ":content_test_mojo_bindings",
     ":test_support",
     "//base/test:test_support",
     "//base/third_party/dynamic_annotations",
     "//cc",
     "//cc:test_support",
     "//cc/surfaces",
-    "//components/display_compositor",
     "//components/scheduler",
     "//content:resources",
     "//content/app:both_for_content_tests",
     "//content/browser:for_content_tests",
     "//content/browser/cache_storage:cache_storage_proto",
     "//content/browser/notifications:notification_proto",
     "//content/browser/service_worker:service_worker_proto",
     "//content/browser/speech/proto",
     "//content/child:for_content_tests",
     "//content/common:mojo_bindings",
@@ skipping 186 matching lines @@
 
   # Avoid windows due to non-availability of cursor resources in test.
   if (!use_aura || is_win) {
     sources -= [ "../browser/media/capture/cursor_renderer_aura_unittest.cc" ]
   }
   if (use_aura || toolkit_views) {
     deps += [ "//ui/events:test_support" ]
   }
   if (!use_aura && !is_mac) {
     sources -= [
+      "../browser/compositor/buffer_queue_unittest.cc",
       "../browser/compositor/reflector_impl_unittest.cc",
       "../browser/compositor/software_browser_compositor_output_surface_unittest.cc",
     ]
   }
 
   if (!is_win && !is_mac) {
     sources -= [ "../common/plugin_list_unittest.cc" ]
   }
 
   if (use_ozone) {
@@ skipping 44 matching lines @@
 }
 
 test("content_gl_tests") {
   # See comment at the top of //content/BUILD.gn for why this is disabled in
   # component builds.
   if (is_component_build) {
     check_includes = false
   }
 
   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",
     "run_all_gl_tests.cc",
   ]
 
   deps = [
     ":test_support",
     "//base/test:test_support",
     "//content/browser:for_content_tests",
     "//content/public/common",
@@ skipping 19 matching lines @@
       "//content/shell/android:content_shell_assets",
     ]
   } else {
     data_deps = [
       "//third_party/ffmpeg",
       "//third_party/mesa:osmesa",
     ]
   }
 }
 
+test("content_gl_benchmark") {
+  # See comment at the top of //content/BUILD.gn for why this is disabled in
+  # component builds.
+  if (is_component_build) {
+    check_includes = false
+  }
+
+  sources = [
+    "../browser/compositor/gl_helper_benchmark.cc",
+    "run_gl_benchmark.cc",
+  ]
+
+  deps = [
+    ":test_support",
+    "//base/test:test_support",
+    "//content/browser:for_content_tests",
+    "//content/public/common",
+    "//gpu/blink",
+    "//gpu/command_buffer/client:gl_in_process_context",
+    "//gpu/command_buffer/client:gles2_implementation",
+    "//testing/gtest",
+    "//third_party/WebKit/public:blink",
+    "//ui/base",
+    "//ui/gfx",
+    "//ui/gfx/geometry",
+    "//ui/gl",
+    "//ui/gl:test_support",
+  ]
+}
+
 if (is_android) {
   # TODO(GYP): Port Windows and ChromeOS logic.
   test("video_decode_accelerator_unittest") {
     deps = [
       "//base",
       "//content",
       "//media",
       "//testing/gtest",
       "//ui/base",
       "//ui/gfx",
@@ skipping 21 matching lines @@
         "//gpu:test_support",
         "//media/base/android",
         "//media/base/android:media_java",
         "//media/capture/video/android:capture_java",
         "//testing/gmock",
         "//ui/android:ui_java",
       ]
     }
   }
 }