Update from https://crrev.com/308331

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 <deque>
 #include <limits>
 
 #include "base/lazy_instance.h"
@@ skipping 49 matching lines @@
 base::LazyInstance<FakeTileTaskRunnerImpl> g_fake_tile_task_runner =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 FakeTileManager::FakeTileManager(TileManagerClient* client)
     : TileManager(client,
                   base::MessageLoopProxy::current(),
                   NULL,
                   g_fake_tile_task_runner.Pointer(),
-                  NULL,
                   std::numeric_limits<size_t>::max()) {
 }
 
 FakeTileManager::FakeTileManager(TileManagerClient* client,
                                  ResourcePool* resource_pool)
     : TileManager(client,
                   base::MessageLoopProxy::current(),
                   resource_pool,
                   g_fake_tile_task_runner.Pointer(),
-                  NULL,
                   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(),
                    tile) != tiles_for_raster.end();
 }
 
 void FakeTileManager::Release(Tile* tile) {
   TileManager::Release(tile);
 
   FreeResourcesForReleasedTiles();
   CleanUpReleasedTiles();
 }
 
 }  // namespace cc