| Index: cc/layers/solid_color_layer_impl_unittest.cc
|
| diff --git a/cc/layers/solid_color_layer_impl_unittest.cc b/cc/layers/solid_color_layer_impl_unittest.cc
|
| index a27f22971d0c630c25d1d0a5a2d4492ceff4287f..f81713bb492dfb8c5755cece94e0b681947d65d3 100644
|
| --- a/cc/layers/solid_color_layer_impl_unittest.cc
|
| +++ b/cc/layers/solid_color_layer_impl_unittest.cc
|
| @@ -9,7 +9,7 @@
|
| #include "cc/layers/append_quads_data.h"
|
| #include "cc/layers/solid_color_layer.h"
|
| #include "cc/quads/solid_color_draw_quad.h"
|
| -#include "cc/test/fake_impl_proxy.h"
|
| +#include "cc/test/fake_impl_task_runner_provider.h"
|
| #include "cc/test/fake_layer_tree_host.h"
|
| #include "cc/test/layer_test_common.h"
|
| #include "cc/test/test_task_graph_runner.h"
|
| @@ -26,9 +26,10 @@ TEST(SolidColorLayerImplTest, VerifyTilingCompleteAndNoOverlap) {
|
| gfx::Size layer_size = gfx::Size(800, 600);
|
| gfx::Rect visible_layer_rect = gfx::Rect(layer_size);
|
|
|
| - FakeImplProxy proxy;
|
| + FakeImplTaskRunnerProvider task_runner_provider;
|
| TestTaskGraphRunner task_graph_runner;
|
| - FakeLayerTreeHostImpl host_impl(&proxy, nullptr, &task_graph_runner);
|
| + FakeLayerTreeHostImpl host_impl(&task_runner_provider, nullptr,
|
| + &task_graph_runner);
|
| scoped_ptr<SolidColorLayerImpl> layer =
|
| SolidColorLayerImpl::Create(host_impl.active_tree(), 1);
|
| layer->draw_properties().visible_layer_rect = visible_layer_rect;
|
| @@ -51,9 +52,10 @@ TEST(SolidColorLayerImplTest, VerifyCorrectBackgroundColorInQuad) {
|
| gfx::Size layer_size = gfx::Size(100, 100);
|
| gfx::Rect visible_layer_rect = gfx::Rect(layer_size);
|
|
|
| - FakeImplProxy proxy;
|
| + FakeImplTaskRunnerProvider task_runner_provider;
|
| TestTaskGraphRunner task_graph_runner;
|
| - FakeLayerTreeHostImpl host_impl(&proxy, nullptr, &task_graph_runner);
|
| + FakeLayerTreeHostImpl host_impl(&task_runner_provider, nullptr,
|
| + &task_graph_runner);
|
| scoped_ptr<SolidColorLayerImpl> layer =
|
| SolidColorLayerImpl::Create(host_impl.active_tree(), 1);
|
| layer->draw_properties().visible_layer_rect = visible_layer_rect;
|
| @@ -79,9 +81,10 @@ TEST(SolidColorLayerImplTest, VerifyCorrectOpacityInQuad) {
|
| gfx::Size layer_size = gfx::Size(100, 100);
|
| gfx::Rect visible_layer_rect = gfx::Rect(layer_size);
|
|
|
| - FakeImplProxy proxy;
|
| + FakeImplTaskRunnerProvider task_runner_provider;
|
| TestTaskGraphRunner task_graph_runner;
|
| - FakeLayerTreeHostImpl host_impl(&proxy, nullptr, &task_graph_runner);
|
| + FakeLayerTreeHostImpl host_impl(&task_runner_provider, nullptr,
|
| + &task_graph_runner);
|
| scoped_ptr<SolidColorLayerImpl> layer =
|
| SolidColorLayerImpl::Create(host_impl.active_tree(), 1);
|
| layer->draw_properties().visible_layer_rect = visible_layer_rect;
|
| @@ -107,9 +110,10 @@ TEST(SolidColorLayerImplTest, VerifyCorrectBlendModeInQuad) {
|
| gfx::Size layer_size = gfx::Size(100, 100);
|
| gfx::Rect visible_layer_rect = gfx::Rect(layer_size);
|
|
|
| - FakeImplProxy proxy;
|
| + FakeImplTaskRunnerProvider task_runner_provider;
|
| TestTaskGraphRunner task_graph_runner;
|
| - FakeLayerTreeHostImpl host_impl(&proxy, nullptr, &task_graph_runner);
|
| + FakeLayerTreeHostImpl host_impl(&task_runner_provider, nullptr,
|
| + &task_graph_runner);
|
| scoped_ptr<SolidColorLayerImpl> layer =
|
| SolidColorLayerImpl::Create(host_impl.active_tree(), 1);
|
| layer->SetBounds(layer_size);
|
|
|