| Index: cc/layers/picture_layer_unittest.cc
|
| diff --git a/cc/layers/picture_layer_unittest.cc b/cc/layers/picture_layer_unittest.cc
|
| index 5ae3b665881609f2cb3593cb16ca00036fb52908..1ba4387702c4f6f3b52766c88c4ef043901696e5 100644
|
| --- a/cc/layers/picture_layer_unittest.cc
|
| +++ b/cc/layers/picture_layer_unittest.cc
|
| @@ -20,7 +20,6 @@
|
| #include "cc/test/fake_picture_layer_impl.h"
|
| #include "cc/test/fake_proxy.h"
|
| #include "cc/test/fake_recording_source.h"
|
| -#include "cc/test/layer_tree_settings_for_testing.h"
|
| #include "cc/test/skia_common.h"
|
| #include "cc/test/stub_layer_tree_host_single_thread_client.h"
|
| #include "cc/test/test_task_graph_runner.h"
|
| @@ -102,7 +101,7 @@ TEST(PictureLayerTest, InvalidateRasterAfterUpdate) {
|
| FakeImplTaskRunnerProvider impl_task_runner_provider;
|
| std::unique_ptr<CompositorFrameSink> compositor_frame_sink(
|
| FakeCompositorFrameSink::Create3d());
|
| - LayerTreeSettings layer_tree_settings = LayerTreeSettingsForTesting();
|
| + LayerTreeSettings layer_tree_settings = LayerTreeSettings();
|
| layer_tree_settings.image_decode_tasks_enabled = true;
|
| FakeLayerTreeHostImpl host_impl(
|
| layer_tree_settings, &impl_task_runner_provider, &task_graph_runner);
|
| @@ -145,7 +144,7 @@ TEST(PictureLayerTest, InvalidateRasterWithoutUpdate) {
|
| FakeImplTaskRunnerProvider impl_task_runner_provider;
|
| std::unique_ptr<CompositorFrameSink> compositor_frame_sink(
|
| FakeCompositorFrameSink::Create3d());
|
| - LayerTreeSettings layer_tree_settings = LayerTreeSettingsForTesting();
|
| + LayerTreeSettings layer_tree_settings = LayerTreeSettings();
|
| layer_tree_settings.image_decode_tasks_enabled = true;
|
| FakeLayerTreeHostImpl host_impl(
|
| layer_tree_settings, &impl_task_runner_provider, &task_graph_runner);
|
| @@ -192,7 +191,7 @@ TEST(PictureLayerTest, ClearVisibleRectWhenNoTiling) {
|
|
|
| std::unique_ptr<CompositorFrameSink> compositor_frame_sink(
|
| FakeCompositorFrameSink::Create3d());
|
| - LayerTreeSettings layer_tree_settings = LayerTreeSettingsForTesting();
|
| + LayerTreeSettings layer_tree_settings = LayerTreeSettings();
|
| layer_tree_settings.image_decode_tasks_enabled = true;
|
| FakeLayerTreeHostImpl host_impl(
|
| layer_tree_settings, &impl_task_runner_provider, &task_graph_runner);
|
| @@ -290,7 +289,7 @@ TEST(PictureLayerTest, SuitableForGpuRasterization) {
|
| // non-monotonically. This executes that code path under this scenario allowing
|
| // for the code to verify correctness with DCHECKs.
|
| TEST(PictureLayerTest, NonMonotonicSourceFrameNumber) {
|
| - LayerTreeSettings settings = LayerTreeSettingsForTesting();
|
| + LayerTreeSettings settings = LayerTreeSettings();
|
| settings.single_thread_proxy_scheduler = false;
|
| settings.use_zero_copy = true;
|
|
|
|
|