| Index: cc/resources/tile_manager_unittest.cc
|
| diff --git a/cc/resources/tile_manager_unittest.cc b/cc/resources/tile_manager_unittest.cc
|
| index b8aceb6cb89c22a7b855a7929d8e717b6bcac20a..212d1b57a071cbfa31bebbe206159b9232819dc5 100644
|
| --- a/cc/resources/tile_manager_unittest.cc
|
| +++ b/cc/resources/tile_manager_unittest.cc
|
| @@ -491,6 +491,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);
|
| @@ -507,8 +509,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;
|
| + }
|
| }
|
| }
|
|
|
| @@ -518,6 +524,8 @@ TEST_F(TileManagerTilePriorityQueueTest, EvictionTilePriorityQueue) {
|
| queue.Pop();
|
| }
|
|
|
| + EXPECT_EQ(3, distance_increasing);
|
| + EXPECT_EQ(16, distance_decreasing);
|
| EXPECT_EQ(tile_count, smoothness_tiles.size());
|
| EXPECT_EQ(all_tiles, smoothness_tiles);
|
|
|
| @@ -526,6 +534,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);
|
| @@ -541,8 +551,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;
|
| + }
|
| }
|
| }
|
|
|
| @@ -551,6 +565,9 @@ TEST_F(TileManagerTilePriorityQueueTest, EvictionTilePriorityQueue) {
|
| queue.Pop();
|
| }
|
|
|
| + EXPECT_EQ(3, distance_increasing);
|
| + EXPECT_EQ(16, distance_decreasing);
|
| +
|
| EXPECT_EQ(tile_count, new_content_tiles.size());
|
| EXPECT_EQ(all_tiles, new_content_tiles);
|
| }
|
|
|