Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/test/test_layer_tree_host_base.cc

Index: cc/test/test_layer_tree_host_base.cc
diff --git a/cc/test/test_layer_tree_host_base.cc b/cc/test/test_layer_tree_host_base.cc
index 92b288890687c117abf783d9d3da2cfaf3f0235c..bcb20a4d61c4fc8c98df8afe0dbb624e39d916f3 100644
--- a/cc/test/test_layer_tree_host_base.cc
+++ b/cc/test/test_layer_tree_host_base.cc
@@ -4,7 +4,7 @@
 
 #include "cc/test/test_layer_tree_host_base.h"
 
-#include "cc/test/fake_output_surface.h"
+#include "cc/test/fake_compositor_frame_sink.h"
 #include "cc/test/fake_raster_source.h"
 #include "cc/trees/layer_tree_impl.h"
 
@@ -21,7 +21,7 @@ TestLayerTreeHostBase::TestLayerTreeHostBase()
 TestLayerTreeHostBase::~TestLayerTreeHostBase() = default;
 
 void TestLayerTreeHostBase::SetUp() {
-  output_surface_ = CreateOutputSurface();
+  compositor_frame_sink_ = CreateCompositorFrameSink();
   task_graph_runner_ = CreateTaskGraphRunner();
   host_impl_ = CreateHostImpl(CreateSettings(), &task_runner_provider_,
                               &shared_bitmap_manager_, task_graph_runner_.get(),
@@ -37,8 +37,9 @@ LayerTreeSettings TestLayerTreeHostBase::CreateSettings() {
   return settings;
 }
 
-std::unique_ptr<OutputSurface> TestLayerTreeHostBase::CreateOutputSurface() {
-  return FakeOutputSurface::CreateDelegating3d();
+std::unique_ptr<CompositorFrameSink>
+TestLayerTreeHostBase::CreateCompositorFrameSink() {
+  return FakeCompositorFrameSink::Create3d();
 }
 
 std::unique_ptr<FakeLayerTreeHostImpl> TestLayerTreeHostBase::CreateHostImpl(
@@ -59,15 +60,15 @@ TestLayerTreeHostBase::CreateTaskGraphRunner() {
 
 void TestLayerTreeHostBase::InitializeRenderer() {
   host_impl_->SetVisible(true);
-  host_impl_->InitializeRenderer(output_surface_.get());
+  host_impl_->InitializeRenderer(compositor_frame_sink_.get());
 }
 
-void TestLayerTreeHostBase::ResetOutputSurface(
-    std::unique_ptr<OutputSurface> output_surface) {
-  host_impl()->DidLoseOutputSurface();
+void TestLayerTreeHostBase::ResetCompositorFrameSink(
+    std::unique_ptr<CompositorFrameSink> compositor_frame_sink) {
+  host_impl()->DidLoseCompositorFrameSink();
   host_impl()->SetVisible(true);
-  host_impl()->InitializeRenderer(output_surface.get());
-  output_surface_ = std::move(output_surface);
+  host_impl()->InitializeRenderer(compositor_frame_sink.get());
+  compositor_frame_sink_ = std::move(compositor_frame_sink);
 }
 
 std::unique_ptr<FakeLayerTreeHostImpl> TestLayerTreeHostBase::TakeHostImpl() {