cc: Make tiles that are not required by trees NEVER_BIN

cc/resources/tile_manager_unittest.cc

 // Copyright 2013 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/tile.h"
 #include "cc/resources/tile_priority.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_tile_manager.h"
 #include "cc/test/fake_tile_manager_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 124 matching lines @@
       CreateTiles(3, TilePriority(), TilePriorityForNowBin());
   TileVector active_pending_soon = CreateTiles(
       3, TilePriorityForSoonBin(), TilePriorityForSoonBin());
   TileVector never_bin = CreateTiles(1, TilePriority(), TilePriority());
 
   tile_manager()->ManageTiles();
 
   EXPECT_EQ(3, AssignedMemoryCounts(active_now));
   EXPECT_EQ(3, AssignedMemoryCounts(pending_now));
   EXPECT_EQ(3, AssignedMemoryCounts(active_pending_soon));
-  EXPECT_EQ(1, AssignedMemoryCounts(never_bin));
+  EXPECT_EQ(0, AssignedMemoryCounts(never_bin));
 
   active_now.clear();
   pending_now.clear();
   active_pending_soon.clear();
   never_bin.clear();
 
   TearDown();
 }
 
 TEST_F(TileManagerTest, EnoughMemoryAllowPrepaintOnly) {
@@ skipping 133 matching lines @@
   tile_manager()->ManageTiles();
 
   EXPECT_EQ(0, AssignedMemoryCounts(active_tree_tiles));
   EXPECT_EQ(4, AssignedMemoryCounts(pending_tree_tiles));
 
   pending_tree_tiles.clear();
   active_tree_tiles.clear();
   TearDown();
 }
 
+TEST_F(TileManagerTest, TotalOOMActiveSoonMemoryToPending) {
+  // 5 tiles on active tree soon bin, 5 tiles on pending tree now bin,
+  // but only enough memory for 4 tiles. The result is 4 pending tree tiles
+  // get memory, and none of the active tree tiles get memory.
+
+  Initialize(4, ALLOW_ANYTHING, SMOOTHNESS_TAKES_PRIORITY);
+  TileVector active_tree_tiles =
+      CreateTiles(5, TilePriorityForSoonBin(), TilePriority());
+  TileVector pending_tree_tiles =
+      CreateTiles(5, TilePriority(), TilePriorityForNowBin());
+
+  tile_manager()->ManageTiles();
+
+  EXPECT_EQ(0, AssignedMemoryCounts(active_tree_tiles));
+  EXPECT_EQ(4, AssignedMemoryCounts(pending_tree_tiles));
+
+  pending_tree_tiles.clear();
+  active_tree_tiles.clear();
+  TearDown();
+}
+
 TEST_F(TileManagerTest, TotalOOMMemoryToActive) {
   // 5 tiles on active tree eventually bin, 5 tiles on pending tree now bin,
   // but only enough memory for 4 tiles. The result is 5 active tree tiles
   // get memory, and none of the pending tree tiles get memory.
 
   Initialize(4, ALLOW_ANYTHING, SMOOTHNESS_TAKES_PRIORITY);
   TileVector active_tree_tiles =
       CreateTiles(5, TilePriorityForNowBin(), TilePriority());
   TileVector pending_tree_tiles =
       CreateTiles(5, TilePriority(), TilePriorityForNowBin());
 
   tile_manager()->ManageTiles();
 
   EXPECT_EQ(4, AssignedMemoryCounts(active_tree_tiles));
   EXPECT_EQ(0, AssignedMemoryCounts(pending_tree_tiles));
 
   pending_tree_tiles.clear();
   active_tree_tiles.clear();
   TearDown();
 }
 
 }  // namespace
 }  // namespace cc