Index: cc/test/test_layer_tree_host_base.h |
diff --git a/cc/test/test_layer_tree_host_base.h b/cc/test/test_layer_tree_host_base.h |
index 849ed66b2068e8c82d78c91a3ba80a0876b7ac06..b9c48eb9ce62ff6a36de6de4ef3737dfca2f9d0e 100644 |
--- a/cc/test/test_layer_tree_host_base.h |
+++ b/cc/test/test_layer_tree_host_base.h |
@@ -7,7 +7,7 @@ |
#include <memory> |
-#include "cc/output/output_surface.h" |
+#include "cc/output/compositor_frame_sink.h" |
#include "cc/test/fake_impl_task_runner_provider.h" |
#include "cc/test/fake_layer_tree_host_impl.h" |
#include "cc/test/fake_picture_layer_impl.h" |
@@ -28,7 +28,7 @@ class TestLayerTreeHostBase : public testing::Test { |
void SetUp() override; |
virtual LayerTreeSettings CreateSettings(); |
- virtual std::unique_ptr<OutputSurface> CreateOutputSurface(); |
+ virtual std::unique_ptr<CompositorFrameSink> CreateCompositorFrameSink(); |
virtual std::unique_ptr<FakeLayerTreeHostImpl> CreateHostImpl( |
const LayerTreeSettings& settings, |
TaskRunnerProvider* task_runner_provider, |
@@ -38,7 +38,8 @@ class TestLayerTreeHostBase : public testing::Test { |
virtual std::unique_ptr<TaskGraphRunner> CreateTaskGraphRunner(); |
virtual void InitializeRenderer(); |
- void ResetOutputSurface(std::unique_ptr<OutputSurface> output_surface); |
+ void ResetCompositorFrameSink( |
+ std::unique_ptr<CompositorFrameSink> compositor_frame_sink); |
std::unique_ptr<FakeLayerTreeHostImpl> TakeHostImpl(); |
void SetupDefaultTrees(const gfx::Size& layer_bounds); |
@@ -55,7 +56,9 @@ class TestLayerTreeHostBase : public testing::Test { |
TaskGraphRunner* task_graph_runner() const { |
return task_graph_runner_.get(); |
} |
- OutputSurface* output_surface() const { return output_surface_.get(); } |
+ CompositorFrameSink* compositor_frame_sink() const { |
+ return compositor_frame_sink_.get(); |
+ } |
FakePictureLayerImpl* pending_layer() const { return pending_layer_; } |
FakePictureLayerImpl* active_layer() const { return active_layer_; } |
FakePictureLayerImpl* old_pending_layer() const { return old_pending_layer_; } |
@@ -68,7 +71,7 @@ class TestLayerTreeHostBase : public testing::Test { |
TestSharedBitmapManager shared_bitmap_manager_; |
std::unique_ptr<TaskGraphRunner> task_graph_runner_; |
TestGpuMemoryBufferManager gpu_memory_buffer_manager_; |
- std::unique_ptr<OutputSurface> output_surface_; |
+ std::unique_ptr<CompositorFrameSink> compositor_frame_sink_; |
std::unique_ptr<FakeLayerTreeHostImpl> host_impl_; |
FakePictureLayerImpl* pending_layer_; |