Revert 173406 - Crashes on Win & Mac

cc/layer_tree_host_unittest.cc

Index: cc/layer_tree_host_unittest.cc
===================================================================
--- cc/layer_tree_host_unittest.cc	(revision 173406)
+++ cc/layer_tree_host_unittest.cc	(working copy)
@@ -1339,13 +1339,9 @@
         EXPECT_EQ(gfx::Point(2, 2), child->position());
 
         // Compute all the layer transforms for the frame.
-        LayerTreeHostImpl::FrameData frameData;
-        mockImpl->prepareToDraw(frameData);
-        mockImpl->didDrawAllLayers(frameData);
+        MockLayerTreeHostImpl::LayerList renderSurfaceLayerList;
+        mockImpl->calculateRenderSurfaceLayerList(renderSurfaceLayerList);
 
-        const MockLayerTreeHostImpl::LayerList& renderSurfaceLayerList =
-          *frameData.renderSurfaceLayerList;
-
         // Both layers should be drawing into the root render surface.
         ASSERT_EQ(1u, renderSurfaceLayerList.size());
         ASSERT_EQ(root->renderSurface(), renderSurfaceLayerList[0]->renderSurface());