summaryrefslogtreecommitdiffstats
path: root/cc/test/layer_tree_json_parser_unittest.cc
diff options
context:
space:
mode:
authorjbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-20 17:25:45 +0000
committerjbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-20 17:25:45 +0000
commit4e2eb35838d42017542959dbef29d84ca6d2bbc4 (patch)
tree7eabd0b457f008c43398e158cabdd616d9cf7a61 /cc/test/layer_tree_json_parser_unittest.cc
parent22e548845b1548ebad28c9d68ad075bce949ec57 (diff)
downloadchromium_src-4e2eb35838d42017542959dbef29d84ca6d2bbc4.zip
chromium_src-4e2eb35838d42017542959dbef29d84ca6d2bbc4.tar.gz
chromium_src-4e2eb35838d42017542959dbef29d84ca6d2bbc4.tar.bz2
Switch to use SharedBitmapManager all the time in cc_unittests
This matches the behavior of the browser and renderer better, and lets us use SharedBitmaps in more tests. Review URL: https://codereview.chromium.org/202763002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258318 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/layer_tree_json_parser_unittest.cc')
-rw-r--r--cc/test/layer_tree_json_parser_unittest.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/cc/test/layer_tree_json_parser_unittest.cc b/cc/test/layer_tree_json_parser_unittest.cc
index 3fd6725..10efbaa 100644
--- a/cc/test/layer_tree_json_parser_unittest.cc
+++ b/cc/test/layer_tree_json_parser_unittest.cc
@@ -63,7 +63,8 @@ class LayerTreeJsonParserSanityCheck : public testing::Test {
TEST_F(LayerTreeJsonParserSanityCheck, Basic) {
FakeImplProxy proxy;
- FakeLayerTreeHostImpl host_impl(&proxy);
+ TestSharedBitmapManager shared_bitmap_manager;
+ FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager);
LayerTreeImpl* tree = host_impl.active_tree();
scoped_ptr<LayerImpl> root_impl(LayerImpl::Create(tree, 1));
@@ -90,7 +91,8 @@ TEST_F(LayerTreeJsonParserSanityCheck, Basic) {
TEST_F(LayerTreeJsonParserSanityCheck, EventHandlerRegions) {
FakeImplProxy proxy;
- FakeLayerTreeHostImpl host_impl(&proxy);
+ TestSharedBitmapManager shared_bitmap_manager;
+ FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager);
LayerTreeImpl* tree = host_impl.active_tree();
scoped_ptr<LayerImpl> root_impl(LayerImpl::Create(tree, 1));