Refactoring for merging ManagedTileState into Tile.

cc/layers/picture_layer_impl_unittest.cc

Index: cc/layers/picture_layer_impl_unittest.cc
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
index 23db4a74df84c8de4ded0ee04d60189b4b3a5e70..65de537442dc20af92f43954aa09c2e0f724d109 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -1691,7 +1691,7 @@ TEST_F(NoLowResPictureLayerImplTest,
     if (viewport_for_tile_priority.Intersects(iter.geometry_rect())) {
       num_inside++;
       // Mark everything in viewport for tile priority as ready to draw.
-      ManagedTileState::DrawInfo& draw_info = tile->draw_info();
+      TileDrawInfo& draw_info = tile->draw_info();
       draw_info.SetSolidColorForTesting(SK_ColorRED);
     } else {
       num_outside++;
@@ -2836,7 +2836,7 @@ TEST_F(PictureLayerImplTest, TilingSetRasterQueue) {
        tile_it != high_res_tiles.end();
        ++tile_it) {
     Tile* tile = *tile_it;
-    ManagedTileState::DrawInfo& draw_info = tile->draw_info();
+    TileDrawInfo& draw_info = tile->draw_info();
     draw_info.SetSolidColorForTesting(SK_ColorRED);
   }