Fork cc::OutputSurface into cc::CompositorFrameSink.

blimp/client/core/compositor/BUILD.gn

Index: blimp/client/core/compositor/BUILD.gn
diff --git a/blimp/client/core/compositor/BUILD.gn b/blimp/client/core/compositor/BUILD.gn
index 5ef9f64ad0543a958f841ceb20df4195cc1222fc..105bb92f4348a637244f8edc4e262f3d6950e14e 100644
--- a/blimp/client/core/compositor/BUILD.gn
+++ b/blimp/client/core/compositor/BUILD.gn
@@ -12,19 +12,19 @@ source_set("compositor") {
     "blimp_compositor.h",
     "blimp_compositor_dependencies.cc",
     "blimp_compositor_dependencies.h",
+    "blimp_compositor_frame_sink.cc",
+    "blimp_compositor_frame_sink.h",
+    "blimp_compositor_frame_sink_proxy.h",
     "blimp_compositor_manager.cc",
     "blimp_compositor_manager.h",
     "blimp_image_decoder.cc",
     "blimp_image_decoder.h",
-    "blimp_output_surface.h",
     "blob_channel_feature.cc",
     "blob_channel_feature.h",
     "blob_image_serialization_processor.cc",
     "blob_image_serialization_processor.h",
     "decoding_image_generator.cc",
     "decoding_image_generator.h",
-    "delegated_output_surface.cc",
-    "delegated_output_surface.h",
   ]
 
   deps = [
@@ -56,10 +56,10 @@ source_set("unit_tests") {
 
   sources = [
     "blimp_client_picture_cache_unittest.cc",
+    "blimp_compositor_frame_sink_unittest.cc",
     "blimp_compositor_manager_unittest.cc",
     "blimp_compositor_unittest.cc",
     "blob_channel_feature_unittest.cc",
-    "delegated_output_surface_unittest.cc",
   ]
 
   deps = [