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 d48931328afb8f4af02a324966b609af66d2031f..5e3d3ef532298b1fedc47126cdb55c9bbc6397fc 100644 |
--- a/cc/trees/layer_tree_host_unittest_delegated.cc |
+++ b/cc/trees/layer_tree_host_unittest_delegated.cc |
@@ -250,19 +250,15 @@ class LayerTreeHostDelegatedTestCreateChildId |
host_impl->resource_provider()->GraphicsContext3D(); |
++num_activates_; |
- switch (num_activates_) { |
- case 2: |
- EXPECT_TRUE(delegated_impl->ChildId()); |
- EXPECT_FALSE(did_reset_child_id_); |
+ 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: |
- EXPECT_TRUE(delegated_impl->ChildId()); |
- EXPECT_TRUE(did_reset_child_id_); |
- EndTest(); |
- break; |
+ } else if (did_reset_child_id_) { |
+ EXPECT_TRUE(delegated_impl->ChildId()); |
+ EndTest(); |
} |
} |
@@ -277,7 +273,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; |
} |