Index: cc/test/layer_tree_test.cc |
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc |
index d70d7971db0819bff77f795a91934688dc4244a2..c6db40030284b43ce06db393a180913a5f7c3e9a 100644 |
--- a/cc/test/layer_tree_test.cc |
+++ b/cc/test/layer_tree_test.cc |
@@ -287,12 +287,10 @@ class LayerTreeHostForTesting : public LayerTreeHost { |
scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner) { |
scoped_ptr<LayerTreeHostForTesting> layer_tree_host( |
new LayerTreeHostForTesting(test_hooks, client, settings)); |
- bool success; |
if (impl_task_runner.get()) |
- success = layer_tree_host->InitializeThreaded(impl_task_runner); |
+ layer_tree_host->InitializeThreaded(impl_task_runner); |
else |
- success = layer_tree_host->InitializeSingleThreaded(client); |
- EXPECT_TRUE(success); |
+ layer_tree_host->InitializeSingleThreaded(client); |
return layer_tree_host.Pass(); |
} |
@@ -450,6 +448,10 @@ void LayerTreeTest::PostSetNextCommitForcesRedrawToMainThread() { |
main_thread_weak_ptr_)); |
} |
+void LayerTreeTest::WillBeginTest() { |
+ layer_tree_host_->SetLayerTreeHostClientReady(); |
+} |
+ |
void LayerTreeTest::DoBeginTest() { |
client_ = LayerTreeHostClientForTesting::Create(this); |
@@ -464,7 +466,7 @@ void LayerTreeTest::DoBeginTest() { |
started_ = true; |
beginning_ = true; |
SetupTree(); |
- layer_tree_host_->SetLayerTreeHostClientReady(); |
+ WillBeginTest(); |
BeginTest(); |
beginning_ = false; |
if (end_when_begin_returns_) |