Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/test/fake_layer_tree_host_client.cc

Index: cc/test/fake_layer_tree_host_client.cc
diff --git a/cc/test/fake_layer_tree_host_client.cc b/cc/test/fake_layer_tree_host_client.cc
index b886b1853f3f33391a4dad7689d16e0de9633ee1..1f5f9124335ded637f58fd751fb14e4603182aba 100644
--- a/cc/test/fake_layer_tree_host_client.cc
+++ b/cc/test/fake_layer_tree_host_client.cc
@@ -4,7 +4,7 @@
 
 #include "cc/test/fake_layer_tree_host_client.h"
 
-#include "cc/test/fake_output_surface.h"
+#include "cc/test/fake_compositor_frame_sink.h"
 #include "cc/trees/layer_tree_host.h"
 
 namespace cc {
@@ -12,13 +12,13 @@ namespace cc {
 FakeLayerTreeHostClient::FakeLayerTreeHostClient() = default;
 FakeLayerTreeHostClient::~FakeLayerTreeHostClient() = default;
 
-void FakeLayerTreeHostClient::RequestNewOutputSurface() {
+void FakeLayerTreeHostClient::RequestNewCompositorFrameSink() {
   DCHECK(host_);
-  host_->SetOutputSurface(FakeOutputSurface::CreateDelegating3d());
+  host_->SetCompositorFrameSink(FakeCompositorFrameSink::Create3d());
 }
 
-void FakeLayerTreeHostClient::DidFailToInitializeOutputSurface() {
-  RequestNewOutputSurface();
+void FakeLayerTreeHostClient::DidFailToInitializeCompositorFrameSink() {
+  RequestNewCompositorFrameSink();
 }
 
 }  // namespace cc