Refactoring for merging ManagedTileState into Tile.

cc/resources/picture_layer_tiling_unittest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resources/picture_layer_tiling.h"
 
 #include <limits>
 #include <set>
 
 #include "cc/base/math_util.h"
@@ skipping 1120 matching lines @@
     }
 
     EXPECT_TRUE(it);
     std::set<Tile*> unique_tiles;
     unique_tiles.insert(*it);
     Tile* last_tile = *it;
     have_tiles[last_tile->priority(ACTIVE_TREE).priority_bin] = true;
 
     // On the second iteration, mark everything as ready to draw (solid color).
     if (i == 1) {
-      ManagedTileState::DrawInfo& draw_info = last_tile->draw_info();
+      TileDrawInfo& draw_info = last_tile->draw_info();
       draw_info.SetSolidColorForTesting(SK_ColorRED);
     }
     ++it;
     int eventually_bin_order_correct_count = 0;
     int eventually_bin_order_incorrect_count = 0;
     while (it) {
       Tile* new_tile = *it;
       ++it;
       unique_tiles.insert(new_tile);
 
@@ skipping 15 matching lines @@
           EXPECT_EQ(TilePriority::SOON, new_priority.priority_bin);
         }
       }
       have_tiles[new_priority.priority_bin] = true;
 
       last_tile = new_tile;
 
       // On the second iteration, mark everything as ready to draw (solid
       // color).
       if (i == 1) {
-        ManagedTileState::DrawInfo& draw_info = last_tile->draw_info();
+        TileDrawInfo& draw_info = last_tile->draw_info();
         draw_info.SetSolidColorForTesting(SK_ColorRED);
       }
     }
 
     EXPECT_GT(eventually_bin_order_correct_count,
               eventually_bin_order_incorrect_count);
 
     // We should have now and eventually tiles, as well as soon tiles from
     // the border region.
     EXPECT_TRUE(have_tiles[TilePriority::NOW]);
@@ skipping 893 matching lines @@
   tiling_->Resize(gfx::Size(250, 150));
 
   // Tile size in the tiling should be resized to 250x200.
   EXPECT_EQ(250, tiling_->TilingDataForTesting().max_texture_size().width());
   EXPECT_EQ(200, tiling_->TilingDataForTesting().max_texture_size().height());
   EXPECT_EQ(0u, tiling_->AllRefTilesForTesting().size());
 }
 
 }  // namespace
 }  // namespace cc