| Index: cc/resources/prioritized_tile_set_unittest.cc
 | 
| diff --git a/cc/resources/prioritized_tile_set_unittest.cc b/cc/resources/prioritized_tile_set_unittest.cc
 | 
| index c62bda9d4267fca1b1325fb999b04a9b9efa2216..89b0943cabc3141c6e01cff3e4e7e29d6d52ebfa 100644
 | 
| --- a/cc/resources/prioritized_tile_set_unittest.cc
 | 
| +++ b/cc/resources/prioritized_tile_set_unittest.cc
 | 
| @@ -8,6 +8,7 @@
 | 
|  #include "cc/resources/managed_tile_state.h"
 | 
|  #include "cc/resources/prioritized_tile_set.h"
 | 
|  #include "cc/resources/tile.h"
 | 
| +#include "cc/resources/tile_bundle.h"
 | 
|  #include "cc/test/fake_output_surface.h"
 | 
|  #include "cc/test/fake_output_surface_client.h"
 | 
|  #include "cc/test/fake_picture_pile_impl.h"
 | 
| @@ -78,6 +79,18 @@ class PrioritizedTileSetTest : public testing::Test {
 | 
|                                       true);
 | 
|    }
 | 
|  
 | 
| +  scoped_refptr<Tile> CreateTileWithPriority(
 | 
| +      const TilePriority& priority) {
 | 
| +    scoped_refptr<TileBundle> bundle =
 | 
| +        tile_manager_->CreateTileBundle(0, 0, 1, 1);
 | 
| +    scoped_refptr<Tile> tile = CreateTile();
 | 
| +    bundle->AddTileAt(ACTIVE_TREE, 0, 0, tile);
 | 
| +    bundle->AddTileAt(PENDING_TREE, 0, 0, tile);
 | 
| +    bundle->SetPriority(ACTIVE_TREE, priority);
 | 
| +    bundle->SetPriority(PENDING_TREE, priority);
 | 
| +    return tile;
 | 
| +  }
 | 
| +
 | 
|   private:
 | 
|    LayerTreeSettings settings_;
 | 
|    FakeOutputSurfaceClient output_surface_client_;
 | 
| @@ -123,9 +136,7 @@ TEST_F(PrioritizedTileSetTest, NowAndReadyToDrawBin) {
 | 
|    std::vector<scoped_refptr<Tile> > tiles;
 | 
|    for (int priority = 0; priority < 4; ++priority) {
 | 
|      for (int i = 0; i < 5; ++i) {
 | 
| -      scoped_refptr<Tile> tile = CreateTile();
 | 
| -      tile->SetPriority(ACTIVE_TREE, priorities[priority]);
 | 
| -      tile->SetPriority(PENDING_TREE, priorities[priority]);
 | 
| +      scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
 | 
|        tiles.push_back(tile);
 | 
|        set.InsertTile(tile, NOW_AND_READY_TO_DRAW_BIN);
 | 
|      }
 | 
| @@ -155,9 +166,7 @@ TEST_F(PrioritizedTileSetTest, NowBin) {
 | 
|    std::vector<scoped_refptr<Tile> > tiles;
 | 
|    for (int priority = 0; priority < 4; ++priority) {
 | 
|      for (int i = 0; i < 5; ++i) {
 | 
| -      scoped_refptr<Tile> tile = CreateTile();
 | 
| -      tile->SetPriority(ACTIVE_TREE, priorities[priority]);
 | 
| -      tile->SetPriority(PENDING_TREE, priorities[priority]);
 | 
| +      scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
 | 
|        tiles.push_back(tile);
 | 
|        set.InsertTile(tile, NOW_BIN);
 | 
|      }
 | 
| @@ -189,9 +198,7 @@ TEST_F(PrioritizedTileSetTest, SoonBin) {
 | 
|    std::vector<scoped_refptr<Tile> > tiles;
 | 
|    for (int priority = 0; priority < 4; ++priority) {
 | 
|      for (int i = 0; i < 5; ++i) {
 | 
| -      scoped_refptr<Tile> tile = CreateTile();
 | 
| -      tile->SetPriority(ACTIVE_TREE, priorities[priority]);
 | 
| -      tile->SetPriority(PENDING_TREE, priorities[priority]);
 | 
| +      scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
 | 
|        tiles.push_back(tile);
 | 
|        set.InsertTile(tile, SOON_BIN);
 | 
|      }
 | 
| @@ -224,9 +231,7 @@ TEST_F(PrioritizedTileSetTest, SoonBinNoPriority) {
 | 
|    std::vector<scoped_refptr<Tile> > tiles;
 | 
|    for (int priority = 0; priority < 4; ++priority) {
 | 
|      for (int i = 0; i < 5; ++i) {
 | 
| -      scoped_refptr<Tile> tile = CreateTile();
 | 
| -      tile->SetPriority(ACTIVE_TREE, priorities[priority]);
 | 
| -      tile->SetPriority(PENDING_TREE, priorities[priority]);
 | 
| +      scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
 | 
|        tiles.push_back(tile);
 | 
|        set.InsertTile(tile, SOON_BIN);
 | 
|      }
 | 
| @@ -255,9 +260,7 @@ TEST_F(PrioritizedTileSetTest, EventuallyAndActiveBin) {
 | 
|    std::vector<scoped_refptr<Tile> > tiles;
 | 
|    for (int priority = 0; priority < 4; ++priority) {
 | 
|      for (int i = 0; i < 5; ++i) {
 | 
| -      scoped_refptr<Tile> tile = CreateTile();
 | 
| -      tile->SetPriority(ACTIVE_TREE, priorities[priority]);
 | 
| -      tile->SetPriority(PENDING_TREE, priorities[priority]);
 | 
| +      scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
 | 
|        tiles.push_back(tile);
 | 
|        set.InsertTile(tile, EVENTUALLY_AND_ACTIVE_BIN);
 | 
|      }
 | 
| @@ -289,9 +292,7 @@ TEST_F(PrioritizedTileSetTest, EventuallyBin) {
 | 
|    std::vector<scoped_refptr<Tile> > tiles;
 | 
|    for (int priority = 0; priority < 4; ++priority) {
 | 
|      for (int i = 0; i < 5; ++i) {
 | 
| -      scoped_refptr<Tile> tile = CreateTile();
 | 
| -      tile->SetPriority(ACTIVE_TREE, priorities[priority]);
 | 
| -      tile->SetPriority(PENDING_TREE, priorities[priority]);
 | 
| +      scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
 | 
|        tiles.push_back(tile);
 | 
|        set.InsertTile(tile, EVENTUALLY_BIN);
 | 
|      }
 | 
| @@ -323,9 +324,7 @@ TEST_F(PrioritizedTileSetTest, AtLastAndActiveBin) {
 | 
|    std::vector<scoped_refptr<Tile> > tiles;
 | 
|    for (int priority = 0; priority < 4; ++priority) {
 | 
|      for (int i = 0; i < 5; ++i) {
 | 
| -      scoped_refptr<Tile> tile = CreateTile();
 | 
| -      tile->SetPriority(ACTIVE_TREE, priorities[priority]);
 | 
| -      tile->SetPriority(PENDING_TREE, priorities[priority]);
 | 
| +      scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
 | 
|        tiles.push_back(tile);
 | 
|        set.InsertTile(tile, AT_LAST_AND_ACTIVE_BIN);
 | 
|      }
 | 
| @@ -357,9 +356,7 @@ TEST_F(PrioritizedTileSetTest, AtLastBin) {
 | 
|    std::vector<scoped_refptr<Tile> > tiles;
 | 
|    for (int priority = 0; priority < 4; ++priority) {
 | 
|      for (int i = 0; i < 5; ++i) {
 | 
| -      scoped_refptr<Tile> tile = CreateTile();
 | 
| -      tile->SetPriority(ACTIVE_TREE, priorities[priority]);
 | 
| -      tile->SetPriority(PENDING_TREE, priorities[priority]);
 | 
| +      scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
 | 
|        tiles.push_back(tile);
 | 
|        set.InsertTile(tile, AT_LAST_BIN);
 | 
|      }
 | 
| @@ -439,9 +436,7 @@ TEST_F(PrioritizedTileSetTest, ManyTilesForEachBin) {
 | 
|    PrioritizedTileSet set;
 | 
|    for (int priority = 0; priority < 4; ++priority) {
 | 
|      for (int i = 0; i < 5; ++i) {
 | 
| -      scoped_refptr<Tile> tile = CreateTile();
 | 
| -      tile->SetPriority(ACTIVE_TREE, priorities[priority]);
 | 
| -      tile->SetPriority(PENDING_TREE, priorities[priority]);
 | 
| +      scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
 | 
|  
 | 
|        now_and_ready_to_draw_bins.push_back(tile);
 | 
|        now_bins.push_back(tile);
 | 
| @@ -550,9 +545,7 @@ TEST_F(PrioritizedTileSetTest, ManyTilesForEachBinDisablePriority) {
 | 
|    PrioritizedTileSet set;
 | 
|    for (int priority = 0; priority < 4; ++priority) {
 | 
|      for (int i = 0; i < 5; ++i) {
 | 
| -      scoped_refptr<Tile> tile = CreateTile();
 | 
| -      tile->SetPriority(ACTIVE_TREE, priorities[priority]);
 | 
| -      tile->SetPriority(PENDING_TREE, priorities[priority]);
 | 
| +      scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
 | 
|  
 | 
|        now_and_ready_to_draw_bins.push_back(tile);
 | 
|        now_bins.push_back(tile);
 | 
| 
 |