[cc] Fold more update calls into updateDrawProperties

cc/layer_impl_unittest.cc

Index: cc/layer_impl_unittest.cc
diff --git a/cc/layer_impl_unittest.cc b/cc/layer_impl_unittest.cc
index cc284c7d32a14b5ebddc99cee339448af4bd6f48..3047d5a1673dd6e751370c4fad93696fefa04530 100644
--- a/cc/layer_impl_unittest.cc
+++ b/cc/layer_impl_unittest.cc
@@ -53,13 +53,13 @@ namespace {
 
 #define VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(codeToTest)                 \
     root->resetAllChangeTrackingForSubtree();                           \
-    hostImpl.resetNeedsUpdateDrawPropertiesForTesting();                \
+    hostImpl.forcePrepareToDraw();                                      \
     codeToTest;                                                         \
     EXPECT_TRUE(hostImpl.needsUpdateDrawProperties());
 
 #define VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(codeToTest)              \
     root->resetAllChangeTrackingForSubtree();                           \
-    hostImpl.resetNeedsUpdateDrawPropertiesForTesting();                \
+    hostImpl.forcePrepareToDraw();                                      \
     codeToTest;                                                         \
     EXPECT_FALSE(hostImpl.needsUpdateDrawProperties());
 
@@ -200,7 +200,7 @@ TEST(LayerImplTest, VerifyNeedsUpdateDrawProperties)
     VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->scrollBy(arbitraryVector2d));
     VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->scrollBy(gfx::Vector2d()));
     root->setScrollDelta(gfx::Vector2d(0, 0));
-    hostImpl.resetNeedsUpdateDrawPropertiesForTesting();
+    hostImpl.forcePrepareToDraw();
     VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->setScrollDelta(arbitraryVector2d));
     VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->setScrollDelta(arbitraryVector2d));
     VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->setScrollOffset(arbitraryVector2d));