Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/test/layer_test_common.cc

Index: cc/test/layer_test_common.cc
diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc
index 4e6298d5a65e15158016c5ab776d4627de243fdc..0b26ead82f04a3b71295d1359d764cf296be1901 100644
--- a/cc/test/layer_test_common.cc
+++ b/cc/test/layer_test_common.cc
@@ -17,7 +17,7 @@
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/render_pass.h"
 #include "cc/test/animation_test_common.h"
-#include "cc/test/fake_output_surface.h"
+#include "cc/test/fake_compositor_frame_sink.h"
 #include "cc/test/layer_tree_settings_for_testing.h"
 #include "cc/test/mock_occlusion_tracker.h"
 #include "cc/trees/layer_tree_host_common.h"
@@ -119,7 +119,7 @@ LayerTestCommon::LayerImplTest::LayerImplTest()
     : LayerImplTest(LayerTreeSettingsForTesting()) {}
 
 LayerTestCommon::LayerImplTest::LayerImplTest(const LayerTreeSettings& settings)
-    : output_surface_(FakeOutputSurface::CreateDelegating3d()),
+    : compositor_frame_sink_(FakeCompositorFrameSink::Create3d()),
       host_(FakeLayerTreeHost::Create(&client_, &task_graph_runner_, settings)),
       render_pass_(RenderPass::Create()),
       layer_impl_id_(2) {
@@ -128,7 +128,8 @@ LayerTestCommon::LayerImplTest::LayerImplTest(const LayerTreeSettings& settings)
   host_->host_impl()->active_tree()->SetRootLayerForTesting(std::move(root));
   root_layer_for_testing()->SetHasRenderSurface(true);
   host_->host_impl()->SetVisible(true);
-  EXPECT_TRUE(host_->host_impl()->InitializeRenderer(output_surface_.get()));
+  EXPECT_TRUE(
+      host_->host_impl()->InitializeRenderer(compositor_frame_sink_.get()));
 
   const int timeline_id = AnimationIdProvider::NextTimelineId();
   timeline_ = AnimationTimeline::Create(timeline_id);
@@ -143,7 +144,7 @@ LayerTestCommon::LayerImplTest::LayerImplTest(const LayerTreeSettings& settings)
 LayerTestCommon::LayerImplTest::~LayerImplTest() {
   host_->GetLayerTree()->animation_host()->RemoveAnimationTimeline(timeline_);
   timeline_ = nullptr;
-  host_->host_impl()->ReleaseOutputSurface();
+  host_->host_impl()->ReleaseCompositorFrameSink();
 }
 
 void LayerTestCommon::LayerImplTest::CalcDrawProps(