| 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 6e2ed2445d5f4ccca40bbf3aaa792987c60c1c66..490ba54245d1b379750ad737cd54f77ec3c0ebbb 100644
|
| --- a/cc/trees/layer_tree_host_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_unittest.cc
|
| @@ -1902,7 +1902,6 @@
|
| scoped_ptr<FakeProxy> proxy)
|
| : LayerTreeHost(client, NULL, settings) {
|
| proxy->SetLayerTreeHost(this);
|
| - client->SetLayerTreeHost(this);
|
| InitializeForTesting(proxy.PassAs<Proxy>());
|
| }
|
| };
|
| @@ -1977,7 +1976,6 @@
|
| shared_bitmap_manager.get(),
|
| settings,
|
| base::MessageLoopProxy::current());
|
| - client.SetLayerTreeHost(host.get());
|
| host->Composite(base::TimeTicks::Now());
|
|
|
| EXPECT_EQ(4u, host->settings().max_partial_texture_updates);
|
| @@ -1998,7 +1996,6 @@
|
| shared_bitmap_manager.get(),
|
| settings,
|
| base::MessageLoopProxy::current());
|
| - client.SetLayerTreeHost(host.get());
|
| host->Composite(base::TimeTicks::Now());
|
|
|
| EXPECT_EQ(4u, host->settings().max_partial_texture_updates);
|
| @@ -2019,7 +2016,6 @@
|
| shared_bitmap_manager.get(),
|
| settings,
|
| base::MessageLoopProxy::current());
|
| - client.SetLayerTreeHost(host.get());
|
| host->Composite(base::TimeTicks::Now());
|
|
|
| EXPECT_EQ(0u, host->MaxPartialTextureUpdates());
|
| @@ -2041,7 +2037,6 @@
|
| shared_bitmap_manager.get(),
|
| settings,
|
| base::MessageLoopProxy::current());
|
| - client.SetLayerTreeHost(host.get());
|
| host->Composite(base::TimeTicks::Now());
|
|
|
| EXPECT_EQ(0u, host->MaxPartialTextureUpdates());
|
|
|