| Index: cc/trees/layer_tree_host_unittest_delegated.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest_delegated.cc b/cc/trees/layer_tree_host_unittest_delegated.cc
|
| index 5ab32117e9486904fd0d73dfd950fb8e6b266083..036ea188b9c9aebafdf630c48e49d56c80f8597b 100644
|
| --- a/cc/trees/layer_tree_host_unittest_delegated.cc
|
| +++ b/cc/trees/layer_tree_host_unittest_delegated.cc
|
| @@ -154,19 +154,15 @@ class LayerTreeHostDelegatedTestCreateChildId
|
| host_impl->resource_provider()->GraphicsContext3D();
|
|
|
| ++num_activates_;
|
| - switch (num_activates_) {
|
| - case 2:
|
| + if (num_activates_ == 2) {
|
| EXPECT_TRUE(delegated_impl->ChildId());
|
| EXPECT_FALSE(did_reset_child_id_);
|
|
|
| context->loseContextCHROMIUM(GL_GUILTY_CONTEXT_RESET_ARB,
|
| GL_INNOCENT_CONTEXT_RESET_ARB);
|
| - break;
|
| - case 3:
|
| + } else if (did_reset_child_id_) {
|
| EXPECT_TRUE(delegated_impl->ChildId());
|
| - EXPECT_TRUE(did_reset_child_id_);
|
| EndTest();
|
| - break;
|
| }
|
| }
|
|
|
| @@ -181,7 +177,7 @@ class LayerTreeHostDelegatedTestCreateChildId
|
| FakeDelegatedRendererLayerImpl* delegated_impl =
|
| static_cast<FakeDelegatedRendererLayerImpl*>(root_impl->children()[0]);
|
|
|
| - EXPECT_EQ(2, num_activates_);
|
| + EXPECT_LE(2, num_activates_);
|
| EXPECT_FALSE(delegated_impl->ChildId());
|
| did_reset_child_id_ = true;
|
| }
|
|
|