[cc] Fold more update calls into updateDrawProperties

cc/layer_tree_host_unittest.cc

Index: cc/layer_tree_host_unittest.cc
diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
index 7add7caf714d43f12eb9a779f7ad4971d7ad5b73..bfdcf6291750239f7b57ac3d827acbac0eb369cd 100644
--- a/cc/layer_tree_host_unittest.cc
+++ b/cc/layer_tree_host_unittest.cc
@@ -1329,8 +1329,12 @@ public:
         EXPECT_EQ(gfx::Point(2, 2), child->position());
 
         // Compute all the layer transforms for the frame.
-        MockLayerTreeHostImpl::LayerList renderSurfaceLayerList;
-        mockImpl->calculateRenderSurfaceLayerList(renderSurfaceLayerList);
+        LayerTreeHostImpl::FrameData frameData;
+        mockImpl->prepareToDraw(frameData);
+        mockImpl->didDrawAllLayers(frameData);
+
+        const MockLayerTreeHostImpl::LayerList& renderSurfaceLayerList =
+          *frameData.renderSurfaceLayerList;
 
         // Both layers should be drawing into the root render surface.
         ASSERT_EQ(1u, renderSurfaceLayerList.size());