Chromium Code Reviews| Index: cc/layers/layer_unittest.cc |
| diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc |
| index e439e8dccf00ec97a916564e906069650c4cb755..13edb774fb826711f41f56cd49857ba05efbd3cf 100644 |
| --- a/cc/layers/layer_unittest.cc |
| +++ b/cc/layers/layer_unittest.cc |
| @@ -14,6 +14,7 @@ |
| #include "cc/test/fake_layer_tree_host_impl.h" |
| #include "cc/test/geometry_test_utils.h" |
| #include "cc/test/layer_test_common.h" |
| +#include "cc/test/test_shared_bitmap_manager.h" |
| #include "cc/trees/layer_tree_host.h" |
| #include "cc/trees/single_thread_proxy.h" |
| #include "testing/gmock/include/gmock/gmock.h" |
| @@ -803,25 +804,26 @@ TEST_F(LayerTest, MaskAndReplicaHasParent) { |
| class LayerTreeHostFactory { |
| public: |
| - LayerTreeHostFactory() |
| - : client_(FakeLayerTreeHostClient::DIRECT_3D) {} |
| + LayerTreeHostFactory() : client_(FakeLayerTreeHostClient::DIRECT_3D) { |
| + shared_bitmap_manager_.reset(new TestSharedBitmapManager()); |
|
danakj
2014/03/18 23:42:44
do this as constructor initialization like client_
|
| + } |
| scoped_ptr<LayerTreeHost> Create() { |
| return LayerTreeHost::CreateSingleThreaded(&client_, |
| &client_, |
| - NULL, |
| + shared_bitmap_manager_.get(), |
| LayerTreeSettings()).Pass(); |
| } |
| scoped_ptr<LayerTreeHost> Create(LayerTreeSettings settings) { |
| - return LayerTreeHost::CreateSingleThreaded(&client_, |
| - &client_, |
| - NULL, |
| - settings).Pass(); |
| + return LayerTreeHost::CreateSingleThreaded( |
| + &client_, &client_, shared_bitmap_manager_.get(), settings) |
| + .Pass(); |
| } |
| private: |
| FakeLayerTreeHostClient client_; |
| + scoped_ptr<SharedBitmapManager> shared_bitmap_manager_; |
| }; |
| void AssertLayerTreeHostMatchesForSubtree(Layer* layer, LayerTreeHost* host) { |