Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/test/fake_layer_tree_host_client.h

Index: cc/test/fake_layer_tree_host_client.h
diff --git a/cc/test/fake_layer_tree_host_client.h b/cc/test/fake_layer_tree_host_client.h
index ad24d4a993ab938e3319e028e11a50433b777c14..0eb802692d3164ffebf4d48a3952ace113084f15 100644
--- a/cc/test/fake_layer_tree_host_client.h
+++ b/cc/test/fake_layer_tree_host_client.h
@@ -19,8 +19,8 @@ class FakeLayerTreeHostClient : public StubLayerTreeHostClient {
   void SetLayerTreeHost(LayerTreeHost* host) { host_ = host; }
 
   // StubLayerTreeHostClient overrides.
-  void RequestNewOutputSurface() override;
-  void DidFailToInitializeOutputSurface() override;
+  void RequestNewCompositorFrameSink() override;
+  void DidFailToInitializeCompositorFrameSink() override;
 
  private:
   LayerTreeHost* host_ = nullptr;