Fork cc::OutputSurface into cc::CompositorFrameSink.

content/renderer/BUILD.gn

Index: content/renderer/BUILD.gn
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
index 0697208084dcaac6c79003a2757715c28cb2cbc0..d18e0a0e2eeafe94d2b29f7749e6299d3b35e25f 100644
--- a/content/renderer/BUILD.gn
+++ b/content/renderer/BUILD.gn
@@ -42,8 +42,8 @@ target(link_target_type, "renderer") {
     "android/renderer_date_time_picker.h",
     "android/synchronous_compositor_filter.cc",
     "android/synchronous_compositor_filter.h",
-    "android/synchronous_compositor_output_surface.cc",
-    "android/synchronous_compositor_output_surface.h",
+    "android/synchronous_compositor_frame_sink.cc",
+    "android/synchronous_compositor_frame_sink.h",
     "android/synchronous_compositor_proxy.cc",
     "android/synchronous_compositor_proxy.h",
     "android/synchronous_compositor_registry.h",
@@ -133,8 +133,6 @@ target(link_target_type, "renderer") {
     "gpu/compositor_external_begin_frame_source.h",
     "gpu/compositor_forwarding_message_filter.cc",
     "gpu/compositor_forwarding_message_filter.h",
-    "gpu/compositor_output_surface.cc",
-    "gpu/compositor_output_surface.h",
     "gpu/frame_swap_message_queue.cc",
     "gpu/frame_swap_message_queue.h",
     "gpu/gpu_benchmarking_extension.cc",
@@ -144,6 +142,8 @@ target(link_target_type, "renderer") {
     "gpu/render_widget_compositor.cc",
     "gpu/render_widget_compositor.h",
     "gpu/render_widget_compositor_delegate.h",
+    "gpu/renderer_compositor_frame_sink.cc",
+    "gpu/renderer_compositor_frame_sink.h",
     "gpu/stream_texture_host_android.cc",
     "gpu/stream_texture_host_android.h",
     "history_controller.cc",