Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/test/fake_proxy.h

Index: cc/test/fake_proxy.h
diff --git a/cc/test/fake_proxy.h b/cc/test/fake_proxy.h
index 05baad7603267a4397b9009f3f595e851ae77568..4479136f8ff5f03add5a27a4cd2349b1ae2d8e6e 100644
--- a/cc/test/fake_proxy.h
+++ b/cc/test/fake_proxy.h
@@ -19,8 +19,9 @@ class FakeProxy : public Proxy {
 
   bool IsStarted() const override;
   bool CommitToActiveTree() const override;
-  void SetOutputSurface(OutputSurface* output_surface) override {}
-  void ReleaseOutputSurface() override;
+  void SetCompositorFrameSink(
+      CompositorFrameSink* compositor_frame_sink) override {}
+  void ReleaseCompositorFrameSink() override;
   void SetVisible(bool visible) override {}
   void SetNeedsAnimate() override {}
   void SetNeedsUpdateLayers() override {}