Index: cc/resources/tile_manager_unittest.cc |
diff --git a/cc/resources/tile_manager_unittest.cc b/cc/resources/tile_manager_unittest.cc |
index fb2c823a115bf060b53ac9a62dfd7c4b610983c2..2b845b8dac20f689944ee5969073493a54b9cb1a 100644 |
--- a/cc/resources/tile_manager_unittest.cc |
+++ b/cc/resources/tile_manager_unittest.cc |
@@ -402,6 +402,8 @@ TEST_F(TileManagerTilePriorityQueueTest, EvictionTilePriorityQueue) { |
// Here we expect to get increasing ACTIVE_TREE priority_bin. |
queue.Reset(); |
host_impl_.BuildEvictionQueue(&queue, SMOOTHNESS_TAKES_PRIORITY); |
+ int distance_increasing = 0; |
+ int distance_decreasing = 0; |
while (!queue.IsEmpty()) { |
Tile* tile = queue.Top(); |
EXPECT_TRUE(tile); |
@@ -418,8 +420,12 @@ TEST_F(TileManagerTilePriorityQueueTest, EvictionTilePriorityQueue) { |
tile->required_for_activation()); |
if (last_tile->required_for_activation() == |
tile->required_for_activation()) { |
- EXPECT_GE(last_tile->priority(ACTIVE_TREE).distance_to_visible, |
- tile->priority(ACTIVE_TREE).distance_to_visible); |
+ if (last_tile->priority(ACTIVE_TREE).distance_to_visible >= |
+ tile->priority(ACTIVE_TREE).distance_to_visible) { |
+ ++distance_decreasing; |
+ } else { |
+ ++distance_increasing; |
+ } |
} |
} |
@@ -429,6 +435,8 @@ TEST_F(TileManagerTilePriorityQueueTest, EvictionTilePriorityQueue) { |
queue.Pop(); |
} |
+ EXPECT_EQ(4, distance_increasing); |
+ EXPECT_EQ(15, distance_decreasing); |
EXPECT_EQ(tile_count, smoothness_tiles.size()); |
EXPECT_EQ(all_tiles, smoothness_tiles); |
@@ -437,6 +445,8 @@ TEST_F(TileManagerTilePriorityQueueTest, EvictionTilePriorityQueue) { |
// Here we expect to get increasing PENDING_TREE priority_bin. |
queue.Reset(); |
host_impl_.BuildEvictionQueue(&queue, NEW_CONTENT_TAKES_PRIORITY); |
+ distance_increasing = 0; |
+ distance_decreasing = 0; |
while (!queue.IsEmpty()) { |
Tile* tile = queue.Top(); |
EXPECT_TRUE(tile); |
@@ -452,8 +462,12 @@ TEST_F(TileManagerTilePriorityQueueTest, EvictionTilePriorityQueue) { |
tile->required_for_activation()); |
if (last_tile->required_for_activation() == |
tile->required_for_activation()) { |
- EXPECT_GE(last_tile->priority(PENDING_TREE).distance_to_visible, |
- tile->priority(PENDING_TREE).distance_to_visible); |
+ if (last_tile->priority(PENDING_TREE).distance_to_visible >= |
+ tile->priority(PENDING_TREE).distance_to_visible) { |
+ ++distance_decreasing; |
+ } else { |
+ ++distance_increasing; |
+ } |
} |
} |
@@ -462,6 +476,9 @@ TEST_F(TileManagerTilePriorityQueueTest, EvictionTilePriorityQueue) { |
queue.Pop(); |
} |
+ EXPECT_EQ(4, distance_increasing); |
+ EXPECT_EQ(15, distance_decreasing); |
+ |
EXPECT_EQ(tile_count, new_content_tiles.size()); |
EXPECT_EQ(all_tiles, new_content_tiles); |
} |