Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/BUILD.gn

Index: cc/BUILD.gn
diff --git a/cc/BUILD.gn b/cc/BUILD.gn
index b4dcd57f26d7c0c5ea710585904c4f558748af89..d0c24e4a5d4d29b601dcf6bdabd31c43a8dd9f8e 100644
--- a/cc/BUILD.gn
+++ b/cc/BUILD.gn
@@ -209,6 +209,9 @@ component("cc") {
     "output/compositor_frame.h",
     "output/compositor_frame_metadata.cc",
     "output/compositor_frame_metadata.h",
+    "output/compositor_frame_sink.cc",
+    "output/compositor_frame_sink.h",
+    "output/compositor_frame_sink_client.h",
     "output/context_cache_controller.cc",
     "output/context_cache_controller.h",
     "output/context_provider.h",
@@ -613,6 +616,10 @@ static_library("test_support") {
     "test/fake_channel_impl.h",
     "test/fake_client_picture_cache.cc",
     "test/fake_client_picture_cache.h",
+    "test/fake_compositor_frame_sink.cc",
+    "test/fake_compositor_frame_sink.h",
+    "test/fake_compositor_frame_sink_client.cc",
+    "test/fake_compositor_frame_sink_client.h",
     "test/fake_content_layer_client.cc",
     "test/fake_content_layer_client.h",
     "test/fake_engine_picture_cache.cc",
@@ -724,12 +731,12 @@ static_library("test_support") {
     "test/surface_hittest_test_helpers.h",
     "test/task_graph_runner_test_template.cc",
     "test/task_graph_runner_test_template.h",
+    "test/test_compositor_frame_sink.cc",
+    "test/test_compositor_frame_sink.h",
     "test/test_context_provider.cc",
     "test/test_context_provider.h",
     "test/test_context_support.cc",
     "test/test_context_support.h",
-    "test/test_delegating_output_surface.cc",
-    "test/test_delegating_output_surface.h",
     "test/test_gles2_interface.cc",
     "test/test_gles2_interface.h",
     "test/test_gpu_memory_buffer_manager.cc",
@@ -947,10 +954,10 @@ test("cc_unittests") {
     "trees/tree_synchronizer_unittest.cc",
 
     # Surfaces test files.
+    "surfaces/direct_compositor_frame_sink_unittest.cc",
     "surfaces/display_scheduler_unittest.cc",
     "surfaces/display_unittest.cc",
     "surfaces/surface_aggregator_unittest.cc",
-    "surfaces/surface_display_output_surface_unittest.cc",
     "surfaces/surface_factory_unittest.cc",
     "surfaces/surface_hittest_unittest.cc",
     "surfaces/surface_manager_unittest.cc",