[NOT FOR REVIEW]

cc/trees/layer_tree_impl_unittest.cc

Index: cc/trees/layer_tree_impl_unittest.cc
diff --git a/cc/trees/layer_tree_impl_unittest.cc b/cc/trees/layer_tree_impl_unittest.cc
index 8b33f9092f040fb36226b0602f8efabff94beaa2..2e46971f9f669974ef6aa39b87a820017c51ca54 100644
--- a/cc/trees/layer_tree_impl_unittest.cc
+++ b/cc/trees/layer_tree_impl_unittest.cc
@@ -41,9 +41,7 @@ class LayerTreeImplTest : public testing::Test {
     return host_impl().active_tree()->RenderSurfaceLayerList();
   }
 
-  void ExecuteCalculateDrawProperties(
-      LayerImpl* root_layer,
-      bool skip_verify_visible_rect_calculations = false) {
+  void ExecuteCalculateDrawProperties(LayerImpl* root_layer) {
     // We are probably not testing what is intended if the root_layer bounds are
     // empty.
     DCHECK(!root_layer->bounds().IsEmpty());
@@ -52,8 +50,6 @@ class LayerTreeImplTest : public testing::Test {
     LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
         root_layer, root_layer->bounds(), &render_surface_layer_list_impl_);
     inputs.can_adjust_raster_scales = true;
-    if (skip_verify_visible_rect_calculations)
-      inputs.verify_visible_rect_calculations = false;
     LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
   }
 
@@ -252,9 +248,7 @@ TEST_F(LayerTreeImplTest, HitTestingForUninvertibleTransform) {
   // is not always true when we combine clips in target space because if the
   // intersection of combined_clip in taret space with layer_rect projected to
   // target space is empty, we set it to an empty rect.
-  bool skip_verify_visible_rect_calculations = true;
-  host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree(
-      skip_verify_visible_rect_calculations);
+  host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
   ASSERT_EQ(1u, root_layer()->render_surface()->layer_list().size());
@@ -637,7 +631,6 @@ TEST_F(LayerTreeImplTest, HitTestingForMultiClippedRotatedLayer) {
   // Visible rects computed by combinig clips in target space and root space
   // don't match because of rotation transforms. So, we skip
   // verify_visible_rect_calculations.
-  bool skip_verify_visible_rect_calculations = true;
   {
     std::unique_ptr<LayerImpl> child =
         LayerImpl::Create(host_impl().active_tree(), 456);
@@ -677,12 +670,11 @@ TEST_F(LayerTreeImplTest, HitTestingForMultiClippedRotatedLayer) {
     child->test_properties()->AddChild(std::move(grand_child));
     root->test_properties()->AddChild(std::move(child));
 
-    ExecuteCalculateDrawProperties(root, skip_verify_visible_rect_calculations);
+    ExecuteCalculateDrawProperties(root);
   }
 
   host_impl().SetViewportSize(root->bounds());
-  host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree(
-      skip_verify_visible_rect_calculations);
+  host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
   // (11, 89) is close to the the bottom left corner within the clip, but it is
   // not inside the layer.
   gfx::PointF test_point(11.f, 89.f);
@@ -1348,9 +1340,7 @@ TEST_F(LayerTreeImplTest,
   // is not always true when we combine clips in target space because if the
   // intersection of combined_clip in taret space with layer_rect projected to
   // target space is empty, we set it to an empty rect.
-  bool skip_verify_visible_rect_calculations = true;
-  host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree(
-      skip_verify_visible_rect_calculations);
+  host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());