Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/test/layer_test_common.h

Index: cc/test/layer_test_common.h
diff --git a/cc/test/layer_test_common.h b/cc/test/layer_test_common.h
index aaf8024b2be4195040aededb2df7762a660a58e5..a55599603a71e1bcc2e0f475fae571d1557741fc 100644
--- a/cc/test/layer_test_common.h
+++ b/cc/test/layer_test_common.h
@@ -35,7 +35,7 @@ namespace gfx { class Rect; }
 
 namespace cc {
 class LayerImpl;
-class OutputSurface;
+class CompositorFrameSink;
 class QuadList;
 class RenderSurfaceImpl;
 class ResourceProvider;
@@ -140,8 +140,8 @@ class LayerTestCommon {
 
     void RequestCopyOfOutput();
 
-    OutputSurface* output_surface() const {
-      return host_->host_impl()->output_surface();
+    CompositorFrameSink* compositor_frame_sink() const {
+      return host_->host_impl()->compositor_frame_sink();
     }
     ResourceProvider* resource_provider() const {
       return host_->host_impl()->resource_provider();
@@ -165,7 +165,7 @@ class LayerTestCommon {
    private:
     FakeLayerTreeHostClient client_;
     TestTaskGraphRunner task_graph_runner_;
-    std::unique_ptr<OutputSurface> output_surface_;
+    std::unique_ptr<CompositorFrameSink> compositor_frame_sink_;
     std::unique_ptr<FakeLayerTreeHost> host_;
     std::unique_ptr<RenderPass> render_pass_;
     scoped_refptr<AnimationTimeline> timeline_;