Chromium Code Reviews| Index: cc/layers/layer_unittest.cc |
| diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc |
| index 931232a6ef0096b4a38b3f5d8e7b74410f5ea1c4..02edf4c23183f8e8954a914c5d273cc34db5d3ab 100644 |
| --- a/cc/layers/layer_unittest.cc |
| +++ b/cc/layers/layer_unittest.cc |
| @@ -26,6 +26,7 @@ |
| #include "cc/test/geometry_test_utils.h" |
| #include "cc/test/layer_internals_for_test.h" |
| #include "cc/test/layer_test_common.h" |
| +#include "cc/test/stub_layer_tree_host_single_thread_client.h" |
| #include "cc/test/test_gpu_memory_buffer_manager.h" |
| #include "cc/test/test_shared_bitmap_manager.h" |
| #include "cc/test/test_task_graph_runner.h" |
| @@ -919,7 +920,7 @@ class LayerTest : public testing::Test { |
| AnimationHost::CreateForTesting(ThreadInstance::MAIN); |
| layer_tree_host_.reset( |
| - new StrictMock<MockLayerTreeHost>(&fake_client_, ¶ms)); |
| + new StrictMock<MockLayerTreeHost>(&single_thread_client_, ¶ms)); |
|
vmpstr
2016/07/22 21:08:42
It's a bit inconsistent that we pass a single_thre
danakj
2016/07/22 21:19:30
LTHClient and LTHSingleThreadClient are 2 diff int
|
| } |
| void TearDown() override { |
| @@ -988,6 +989,7 @@ class LayerTest : public testing::Test { |
| TestTaskGraphRunner task_graph_runner_; |
| FakeLayerTreeHostImpl host_impl_; |
| + StubLayerTreeHostSingleThreadClient single_thread_client_; |
| FakeLayerTreeHostClient fake_client_; |
| std::unique_ptr<StrictMock<MockLayerTreeHost>> layer_tree_host_; |
| scoped_refptr<Layer> parent_; |
| @@ -1859,11 +1861,12 @@ class LayerTreeHostFactory { |
| params.main_task_runner = base::ThreadTaskRunnerHandle::Get(); |
| params.animation_host = |
| AnimationHost::CreateForTesting(ThreadInstance::MAIN); |
| - return LayerTreeHost::CreateSingleThreaded(&client_, ¶ms); |
| + return LayerTreeHost::CreateSingleThreaded(&single_thread_client_, ¶ms); |
| } |
| private: |
| FakeLayerTreeHostClient client_; |
| + StubLayerTreeHostSingleThreadClient single_thread_client_; |
| TestSharedBitmapManager shared_bitmap_manager_; |
| TestTaskGraphRunner task_graph_runner_; |
| TestGpuMemoryBufferManager gpu_memory_buffer_manager_; |