Merge 250273 "cc: Prevent usage of rasterize on-demand with dele..."

cc/test/fake_tile_manager.cc

Index: cc/test/fake_tile_manager.cc
===================================================================
--- cc/test/fake_tile_manager.cc	(revision 250868)
+++ cc/test/fake_tile_manager.cc	(working copy)
@@ -84,7 +84,8 @@
                   NULL,
                   make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
                   std::numeric_limits<unsigned>::max(),
-                  NULL) {}
+                  NULL,
+                  true) {}
 
 FakeTileManager::FakeTileManager(TileManagerClient* client,
                                  ResourceProvider* resource_provider)
@@ -92,16 +93,28 @@
                   resource_provider,
                   make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
                   std::numeric_limits<unsigned>::max(),
-                  NULL) {}
+                  NULL,
+                  true) {}
 
 FakeTileManager::FakeTileManager(TileManagerClient* client,
                                  ResourceProvider* resource_provider,
+                                 bool allow_on_demand_raster)
+    : TileManager(client,
+                  resource_provider,
+                  make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
+                  std::numeric_limits<unsigned>::max(),
+                  NULL,
+                  allow_on_demand_raster) {}
+
+FakeTileManager::FakeTileManager(TileManagerClient* client,
+                                 ResourceProvider* resource_provider,
                                  size_t raster_task_limit_bytes)
     : TileManager(client,
                   resource_provider,
                   make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
                   raster_task_limit_bytes,
-                  NULL) {}
+                  NULL,
+                  true) {}
 
 FakeTileManager::~FakeTileManager() {}
 
@@ -125,6 +138,10 @@
   RasterWorkerPoolForTesting()->CheckForCompletedTasks();
 }
 
+void FakeTileManager::DidFinishRunningTasksForTesting() {
+  DidFinishRunningTasks();
+}
+
 void FakeTileManager::Release(Tile* tile) {
   TileManager::Release(tile);
   CleanUpReleasedTiles();