| Index: cc/trees/tree_synchronizer_unittest.cc
|
| diff --git a/cc/trees/tree_synchronizer_unittest.cc b/cc/trees/tree_synchronizer_unittest.cc
|
| index 6cf75baf5292d126318b57f3dbeb5d74e6c49228..466a7017a72ca7e283df5c0fd43bfed5e267d4f4 100644
|
| --- a/cc/trees/tree_synchronizer_unittest.cc
|
| +++ b/cc/trees/tree_synchronizer_unittest.cc
|
| @@ -18,6 +18,7 @@
|
| #include "cc/test/fake_layer_tree_host.h"
|
| #include "cc/test/fake_rendering_stats_instrumentation.h"
|
| #include "cc/test/test_shared_bitmap_manager.h"
|
| +#include "cc/test/test_task_graph_runner.h"
|
| #include "cc/trees/proxy.h"
|
| #include "cc/trees/single_thread_proxy.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -195,10 +196,11 @@ class TreeSynchronizerTest : public testing::Test {
|
| public:
|
| TreeSynchronizerTest()
|
| : client_(FakeLayerTreeHostClient::DIRECT_3D),
|
| - host_(FakeLayerTreeHost::Create(&client_)) {}
|
| + host_(FakeLayerTreeHost::Create(&client_, &task_graph_runner_)) {}
|
|
|
| protected:
|
| FakeLayerTreeHostClient client_;
|
| + TestTaskGraphRunner task_graph_runner_;
|
| scoped_ptr<FakeLayerTreeHost> host_;
|
| LayerSettings layer_settings_;
|
| };
|
| @@ -566,11 +568,11 @@ TEST_F(TreeSynchronizerTest, SynchronizeAnimations) {
|
| FakeProxy proxy;
|
| DebugScopedSetImplThread impl(&proxy);
|
| FakeRenderingStatsInstrumentation stats_instrumentation;
|
| - scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
|
| - new TestSharedBitmapManager());
|
| - scoped_ptr<LayerTreeHostImpl> host_impl =
|
| - LayerTreeHostImpl::Create(settings, NULL, &proxy, &stats_instrumentation,
|
| - shared_bitmap_manager.get(), NULL, NULL, 0);
|
| + TestSharedBitmapManager shared_bitmap_manager;
|
| + TestTaskGraphRunner task_graph_runner;
|
| + scoped_ptr<LayerTreeHostImpl> host_impl = LayerTreeHostImpl::Create(
|
| + settings, nullptr, &proxy, &stats_instrumentation, &shared_bitmap_manager,
|
| + nullptr, &task_graph_runner, 0);
|
|
|
| scoped_refptr<Layer> layer_tree_root = Layer::Create(layer_settings_);
|
| host_->SetRootLayer(layer_tree_root);
|
| @@ -600,11 +602,11 @@ TEST_F(TreeSynchronizerTest, SynchronizeScrollParent) {
|
| FakeProxy proxy;
|
| DebugScopedSetImplThread impl(&proxy);
|
| FakeRenderingStatsInstrumentation stats_instrumentation;
|
| - scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
|
| - new TestSharedBitmapManager());
|
| - scoped_ptr<LayerTreeHostImpl> host_impl =
|
| - LayerTreeHostImpl::Create(settings, NULL, &proxy, &stats_instrumentation,
|
| - shared_bitmap_manager.get(), NULL, NULL, 0);
|
| + TestSharedBitmapManager shared_bitmap_manager;
|
| + TestTaskGraphRunner task_graph_runner;
|
| + scoped_ptr<LayerTreeHostImpl> host_impl = LayerTreeHostImpl::Create(
|
| + settings, nullptr, &proxy, &stats_instrumentation, &shared_bitmap_manager,
|
| + nullptr, &task_graph_runner, 0);
|
|
|
| scoped_refptr<Layer> layer_tree_root = Layer::Create(layer_settings_);
|
| scoped_refptr<Layer> scroll_parent = Layer::Create(layer_settings_);
|
| @@ -668,11 +670,11 @@ TEST_F(TreeSynchronizerTest, SynchronizeClipParent) {
|
| FakeProxy proxy;
|
| DebugScopedSetImplThread impl(&proxy);
|
| FakeRenderingStatsInstrumentation stats_instrumentation;
|
| - scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
|
| - new TestSharedBitmapManager());
|
| - scoped_ptr<LayerTreeHostImpl> host_impl =
|
| - LayerTreeHostImpl::Create(settings, NULL, &proxy, &stats_instrumentation,
|
| - shared_bitmap_manager.get(), NULL, NULL, 0);
|
| + TestSharedBitmapManager shared_bitmap_manager;
|
| + TestTaskGraphRunner task_graph_runner;
|
| + scoped_ptr<LayerTreeHostImpl> host_impl = LayerTreeHostImpl::Create(
|
| + settings, nullptr, &proxy, &stats_instrumentation, &shared_bitmap_manager,
|
| + nullptr, &task_graph_runner, 0);
|
|
|
| scoped_refptr<Layer> layer_tree_root = Layer::Create(layer_settings_);
|
| scoped_refptr<Layer> clip_parent = Layer::Create(layer_settings_);
|
|
|