| Index: cc/trees/layer_tree_host_unittest.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
|
| index d608b91130ddd9a476ce8d7caf64159d61b71be8..a99b17dffc0266e9324d40c6ca2c994ff3d4ad3f 100644
|
| --- a/cc/trees/layer_tree_host_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_unittest.cc
|
| @@ -1900,7 +1900,7 @@ class LayerTreeHostWithProxy : public LayerTreeHost {
|
| LayerTreeHostWithProxy(FakeLayerTreeHostClient* client,
|
| const LayerTreeSettings& settings,
|
| scoped_ptr<FakeProxy> proxy)
|
| - : LayerTreeHost(client, NULL, settings) {
|
| + : LayerTreeHost(client, NULL, NULL, settings) {
|
| proxy->SetLayerTreeHost(this);
|
| client->SetLayerTreeHost(this);
|
| InitializeForTesting(proxy.Pass());
|
| @@ -1975,6 +1975,7 @@ TEST(LayerTreeHostTest, PartialUpdatesWithGLRenderer) {
|
| LayerTreeHost::CreateSingleThreaded(&client,
|
| &client,
|
| shared_bitmap_manager.get(),
|
| + NULL,
|
| settings,
|
| base::MessageLoopProxy::current());
|
| client.SetLayerTreeHost(host.get());
|
| @@ -1996,6 +1997,7 @@ TEST(LayerTreeHostTest, PartialUpdatesWithSoftwareRenderer) {
|
| LayerTreeHost::CreateSingleThreaded(&client,
|
| &client,
|
| shared_bitmap_manager.get(),
|
| + NULL,
|
| settings,
|
| base::MessageLoopProxy::current());
|
| client.SetLayerTreeHost(host.get());
|
| @@ -2017,6 +2019,7 @@ TEST(LayerTreeHostTest, PartialUpdatesWithDelegatingRendererAndGLContent) {
|
| LayerTreeHost::CreateSingleThreaded(&client,
|
| &client,
|
| shared_bitmap_manager.get(),
|
| + NULL,
|
| settings,
|
| base::MessageLoopProxy::current());
|
| client.SetLayerTreeHost(host.get());
|
| @@ -2039,6 +2042,7 @@ TEST(LayerTreeHostTest,
|
| LayerTreeHost::CreateSingleThreaded(&client,
|
| &client,
|
| shared_bitmap_manager.get(),
|
| + NULL,
|
| settings,
|
| base::MessageLoopProxy::current());
|
| client.SetLayerTreeHost(host.get());
|
|
|