Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/test/layer_test_common.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_TEST_LAYER_TEST_COMMON_H_
 #define CC_TEST_LAYER_TEST_COMMON_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 17 matching lines @@
   do {                                                                      \
     EXPECT_CALL(*layer_tree_host_, SetNeedsUpdateLayers()).Times((expect)); \
     code_to_test;                                                           \
     Mock::VerifyAndClearExpectations(layer_tree_host_.get());               \
   } while (false)
 
 namespace gfx { class Rect; }
 
 namespace cc {
 class LayerImpl;
-class OutputSurface;
+class CompositorFrameSink;
 class QuadList;
 class RenderSurfaceImpl;
 class ResourceProvider;
 
 class LayerTestCommon {
  public:
   static const char* quad_string;
 
   static void VerifyQuadsExactlyCoverRect(const QuadList& quads,
                                           const gfx::Rect& rect);
@@ skipping 84 matching lines @@
     void AppendQuadsWithOcclusion(LayerImpl* layer_impl,
                                   const gfx::Rect& occluded);
     void AppendQuadsForPassWithOcclusion(LayerImpl* layer_impl,
                                          RenderPass* given_render_pass,
                                          const gfx::Rect& occluded);
     void AppendSurfaceQuadsWithOcclusion(RenderSurfaceImpl* surface_impl,
                                          const gfx::Rect& occluded);
 
     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();
     }
     LayerImpl* root_layer_for_testing() const {
       return host_impl()->active_tree()->root_layer_for_testing();
     }
     FakeLayerTreeHost* host() { return host_.get(); }
     FakeLayerTreeHostImpl* host_impl() const { return host_->host_impl(); }
     TaskRunnerProvider* task_runner_provider() const {
       return host_->host_impl()->task_runner_provider();
     }
     const QuadList& quad_list() const { return render_pass_->quad_list; }
     scoped_refptr<AnimationTimeline> timeline() { return timeline_; }
     scoped_refptr<AnimationTimeline> timeline_impl() { return timeline_impl_; }
 
     void SetElementIdsForTesting() {
       host_impl()->active_tree()->SetElementIdsForTesting();
     }
 
    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_;
     scoped_refptr<AnimationTimeline> timeline_impl_;
     int layer_impl_id_;
   };
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_LAYER_TEST_COMMON_H_