Index: cc/test/fake_tile_manager.cc |
diff --git a/cc/test/fake_tile_manager.cc b/cc/test/fake_tile_manager.cc |
index bb23aa824fcdd9a8a531298911c4105df749985e..f876271f8dae89f073c294f250bf9cfbb52fea28 100644 |
--- a/cc/test/fake_tile_manager.cc |
+++ b/cc/test/fake_tile_manager.cc |
@@ -65,8 +65,9 @@ base::LazyInstance<FakeTileTaskRunnerImpl> g_fake_tile_task_runner = |
FakeTileManager::FakeTileManager(TileManagerClient* client) |
: TileManager(client, |
base::MessageLoopProxy::current(), |
- NULL, |
+ nullptr, |
g_fake_tile_task_runner.Pointer(), |
+ nullptr, |
std::numeric_limits<size_t>::max()) { |
} |
@@ -76,19 +77,12 @@ FakeTileManager::FakeTileManager(TileManagerClient* client, |
base::MessageLoopProxy::current(), |
resource_pool, |
g_fake_tile_task_runner.Pointer(), |
+ nullptr, |
std::numeric_limits<size_t>::max()) { |
} |
FakeTileManager::~FakeTileManager() {} |
-void FakeTileManager::AssignMemoryToTiles( |
- const GlobalStateThatImpactsTilePriority& state) { |
- tiles_for_raster.clear(); |
- |
- SetGlobalStateForTesting(state); |
- AssignGpuMemoryToTiles(&tiles_for_raster); |
-} |
- |
bool FakeTileManager::HasBeenAssignedMemory(Tile* tile) { |
return std::find(tiles_for_raster.begin(), |
tiles_for_raster.end(), |