| Index: cc/test/layer_tree_test.cc
|
| diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
|
| index 312f6431513a87229d489bcddcfedb5f866c7319..b9d506386f7368abdbca38dea6781c7e453505ca 100644
|
| --- a/cc/test/layer_tree_test.cc
|
| +++ b/cc/test/layer_tree_test.cc
|
| @@ -550,7 +550,8 @@ void LayerTreeTest::Timeout() {
|
| }
|
|
|
| void LayerTreeTest::RealEndTest() {
|
| - if (layer_tree_host_ && proxy()->CommitPendingForTesting()) {
|
| + if (layer_tree_host_ && !timed_out_ &&
|
| + proxy()->MainFrameWillHappenForTesting()) {
|
| main_task_runner_->PostTask(
|
| FROM_HERE,
|
| base::Bind(&LayerTreeTest::RealEndTest, main_thread_weak_ptr_));
|
|
|