Revert of Introduce components/display_compositor

content/test/BUILD.gn

Index: content/test/BUILD.gn
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 606fbf99d5c3f2e32182443fe8e569cf85477b49..ed2db4ebf6972af468fc1f7a3c1fa7ab6ba8e32f 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -50,7 +50,6 @@
     "//cc:test_support",
     "//cc/blink",
     "//cc/surfaces",
-    "//components/display_compositor",
     "//components/scheduler:scheduler",
     "//components/scheduler:test_support",
     "//content/app:both_for_content_tests",
@@ -646,7 +645,6 @@
     "//cc",
     "//cc:test_support",
     "//cc/surfaces",
-    "//components/display_compositor",
     "//components/scheduler",
     "//content:resources",
     "//content/app:both_for_content_tests",
@@ -853,6 +851,7 @@
   }
   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",
     ]
@@ -917,6 +916,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",
     "run_all_gl_tests.cc",
@@ -956,6 +957,36 @@
   }
 }
 
+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") {