Index: cc/layers/picture_layer_impl_unittest.cc |
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc |
index 78caf19d7dc06faab24361033d54d74a9443b79b..2063e08eb9c8f8593a5dce3a48215fbac8fb79e0 100644 |
--- a/cc/layers/picture_layer_impl_unittest.cc |
+++ b/cc/layers/picture_layer_impl_unittest.cc |
@@ -21,12 +21,12 @@ |
#include "cc/quads/draw_quad.h" |
#include "cc/quads/tile_draw_quad.h" |
#include "cc/test/begin_frame_args_test.h" |
+#include "cc/test/fake_compositor_frame_sink.h" |
#include "cc/test/fake_content_layer_client.h" |
#include "cc/test/fake_impl_task_runner_provider.h" |
#include "cc/test/fake_layer_tree_host.h" |
#include "cc/test/fake_layer_tree_host_client.h" |
#include "cc/test/fake_layer_tree_host_impl.h" |
-#include "cc/test/fake_output_surface.h" |
#include "cc/test/fake_picture_layer_impl.h" |
#include "cc/test/fake_raster_source.h" |
#include "cc/test/fake_recording_source.h" |
@@ -1454,7 +1454,8 @@ TEST_F(PictureLayerImplTest, ClampTilesToMaxTileSize) { |
std::unique_ptr<TestWebGraphicsContext3D> context = |
TestWebGraphicsContext3D::Create(); |
context->set_max_texture_size(140); |
- ResetOutputSurface(FakeOutputSurface::CreateDelegating3d(std::move(context))); |
+ ResetCompositorFrameSink( |
+ FakeCompositorFrameSink::Create3d(std::move(context))); |
SetupDrawPropertiesAndUpdateTiles(pending_layer(), 1.f, 1.f, 1.f, 1.f, 0.f, |
false); |
@@ -1489,7 +1490,8 @@ TEST_F(PictureLayerImplTest, ClampSingleTileToToMaxTileSize) { |
std::unique_ptr<TestWebGraphicsContext3D> context = |
TestWebGraphicsContext3D::Create(); |
context->set_max_texture_size(140); |
- ResetOutputSurface(FakeOutputSurface::CreateDelegating3d(std::move(context))); |
+ ResetCompositorFrameSink( |
+ FakeCompositorFrameSink::Create3d(std::move(context))); |
SetupDrawPropertiesAndUpdateTiles(active_layer(), 1.f, 1.f, 1.f, 1.f, 0.f, |
false); |
@@ -3584,8 +3586,8 @@ TEST_F(PictureLayerImplTest, SharedQuadStateContainsMaxTilingScale) { |
class PictureLayerImplTestWithDelegatingRenderer : public PictureLayerImplTest { |
public: |
- std::unique_ptr<OutputSurface> CreateOutputSurface() override { |
- return FakeOutputSurface::CreateDelegating3d(); |
+ std::unique_ptr<CompositorFrameSink> CreateCompositorFrameSink() override { |
+ return FakeCompositorFrameSink::Create3d(); |
} |
}; |