Decouple GpuCompositorFrameSink from DisplayCompositor

services/ui/surfaces/BUILD.gn

Index: services/ui/surfaces/BUILD.gn
diff --git a/services/ui/surfaces/BUILD.gn b/services/ui/surfaces/BUILD.gn
index 97157a2507b86dfdd392761427791980832e2162..81e107e7a1b196313408cc0792ad5dbefe8205fe 100644
--- a/services/ui/surfaces/BUILD.gn
+++ b/services/ui/surfaces/BUILD.gn
@@ -10,20 +10,14 @@ source_set("surfaces") {
     "display_compositor.h",
     "display_output_surface.cc",
     "display_output_surface.h",
-    "gpu_compositor_frame_sink.cc",
-    "gpu_compositor_frame_sink.h",
-    "gpu_display_compositor_frame_sink.cc",
-    "gpu_display_compositor_frame_sink.h",
-    "gpu_offscreen_compositor_frame_sink.cc",
-    "gpu_offscreen_compositor_frame_sink.h",
   ]
 
   deps = [
     "//base",
     "//cc",
     "//cc/ipc:internal_interfaces",
-    "//cc/surfaces",
-    "//components/display_compositor",
+    "//cc/surfaces:surfaces",
+    "//components/display_compositor:display_compositor",
     "//gpu/command_buffer/client",
     "//gpu/command_buffer/client:gles2_interface",
     "//gpu/ipc:command_buffer",