Merge 210713 "cc: Remove tile ref counting in tile manager."

cc/test/fake_tile_manager.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/test/fake_tile_manager.h"
 
 #include "cc/resources/raster_worker_pool.h"
 
 namespace cc {
 
@@ skipping 22 matching lines @@
 FakeTileManager::FakeTileManager(TileManagerClient* client,
                                  ResourceProvider* resource_provider)
     : TileManager(client,
                   resource_provider,
                   make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
                   1,
                   false,
                   NULL,
                   resource_provider->best_texture_format()) {}
 
+FakeTileManager::~FakeTileManager() {}
+
 void FakeTileManager::ReassignMemoryToOOMTilesRequiredForActivation() {
-  ReassignGpuMemoryToOOMTilesRequiredForActivation();
+  ReassignGpuMemoryToOOMTilesRequiredForActivation(
+      all_tiles, &tiles_for_raster, &oom_tiles_required_for_activation);
+}
+
+void FakeTileManager::AssignMemoryToTiles() {
+  tiles_for_raster.clear();
+  oom_tiles_required_for_activation.clear();
+  all_tiles.clear();
+
+  GetSortedTiles(&all_tiles);
+  AssignGpuMemoryToTiles(
+      all_tiles, &tiles_for_raster, &oom_tiles_required_for_activation);
 }
 
 bool FakeTileManager::HasBeenAssignedMemory(Tile* tile) {
-  return std::find(tiles_that_need_to_be_rasterized().begin(),
-                   tiles_that_need_to_be_rasterized().end(),
-                   tile) != tiles_that_need_to_be_rasterized().end();
+  return std::find(tiles_for_raster.begin(),
+                   tiles_for_raster.end(),
+                   tile) != tiles_for_raster.end();
 }
 
 }  // namespace cc