cc: Refactor TileTaskWorkerPool.

cc/raster/tile_task_worker_pool_unittest.cc

Index: cc/raster/tile_task_worker_pool_unittest.cc
diff --git a/cc/raster/tile_task_worker_pool_unittest.cc b/cc/raster/tile_task_worker_pool_unittest.cc
index 53c2ae21c06f2cad47e392c4a6846b2106edfa5f..9669ac7bee8bc410d58bdd040831185d70fbcdbf 100644
--- a/cc/raster/tile_task_worker_pool_unittest.cc
+++ b/cc/raster/tile_task_worker_pool_unittest.cc
@@ -34,6 +34,7 @@
 #include "cc/test/test_gpu_memory_buffer_manager.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "cc/test/test_web_graphics_context_3d.h"
+#include "cc/tiles/tile_task_manager.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -141,51 +142,51 @@ class TileTaskWorkerPoolTest
 
   // Overridden from testing::Test:
   void SetUp() override {
+    std::unique_ptr<TileTaskWorkerPool> tile_task_worker_pool;
     switch (GetParam()) {
       case TILE_TASK_WORKER_POOL_TYPE_ZERO_COPY:
         Create3dOutputSurfaceAndResourceProvider();
-        tile_task_worker_pool_ = ZeroCopyTileTaskWorkerPool::Create(
-            base::ThreadTaskRunnerHandle::Get().get(), &task_graph_runner_,
+        tile_task_worker_pool = ZeroCopyTileTaskWorkerPool::Create(
             resource_provider_.get(), PlatformColor::BestTextureFormat());
         break;
       case TILE_TASK_WORKER_POOL_TYPE_ONE_COPY:
         Create3dOutputSurfaceAndResourceProvider();
-        tile_task_worker_pool_ = OneCopyTileTaskWorkerPool::Create(
-            base::ThreadTaskRunnerHandle::Get().get(), &task_graph_runner_,
-            context_provider_.get(), resource_provider_.get(),
-            kMaxBytesPerCopyOperation, false, kMaxStagingBuffers,
-            PlatformColor::BestTextureFormat());
+        tile_task_worker_pool = OneCopyTileTaskWorkerPool::Create(
+            base::ThreadTaskRunnerHandle::Get().get(), context_provider_.get(),
+            resource_provider_.get(), kMaxBytesPerCopyOperation, false,
+            kMaxStagingBuffers, PlatformColor::BestTextureFormat());
         break;
       case TILE_TASK_WORKER_POOL_TYPE_GPU:
         Create3dOutputSurfaceAndResourceProvider();
-        tile_task_worker_pool_ = GpuTileTaskWorkerPool::Create(
-            base::ThreadTaskRunnerHandle::Get().get(), &task_graph_runner_,
+        tile_task_worker_pool = GpuTileTaskWorkerPool::Create(
             context_provider_.get(), resource_provider_.get(), false, 0);
         break;
       case TILE_TASK_WORKER_POOL_TYPE_BITMAP:
         CreateSoftwareOutputSurfaceAndResourceProvider();
-        tile_task_worker_pool_ = BitmapTileTaskWorkerPool::Create(
-            base::ThreadTaskRunnerHandle::Get().get(), &task_graph_runner_,
-            resource_provider_.get());
+        tile_task_worker_pool =
+            BitmapTileTaskWorkerPool::Create(resource_provider_.get());
         break;
     }
 
-    DCHECK(tile_task_worker_pool_);
+    DCHECK(tile_task_worker_pool);
+
+    tile_task_manager_ = TileTaskManager::Create(
+        std::move(tile_task_worker_pool), &task_graph_runner_);
   }
 
   void TearDown() override {
-    tile_task_worker_pool_->Shutdown();
-    tile_task_worker_pool_->CheckForCompletedTasks();
+    tile_task_manager_->Shutdown();
+    tile_task_manager_->CheckForCompletedTasks();
   }
 
   void AllTileTasksFinished() {
-    tile_task_worker_pool_->CheckForCompletedTasks();
+    tile_task_manager_->CheckForCompletedTasks();
     base::MessageLoop::current()->QuitWhenIdle();
   }
 
   void RunMessageLoopUntilAllTasksHaveCompleted() {
     task_graph_runner_.RunUntilIdle();
-    tile_task_worker_pool_->CheckForCompletedTasks();
+    tile_task_manager_->CheckForCompletedTasks();
   }
 
   void ScheduleTasks() {
@@ -199,7 +200,7 @@ class TileTaskWorkerPoolTest
                                 0 /* dependencies */);
     }
 
-    tile_task_worker_pool_->ScheduleTasks(&graph_);
+    tile_task_manager_->ScheduleTasks(&graph_);
   }
 
   void AppendTask(unsigned id, const gfx::Size& size) {
@@ -287,7 +288,7 @@ class TileTaskWorkerPoolTest
   FakeOutputSurfaceClient output_surface_client_;
   std::unique_ptr<FakeOutputSurface> output_surface_;
   std::unique_ptr<ResourceProvider> resource_provider_;
-  std::unique_ptr<TileTaskWorkerPool> tile_task_worker_pool_;
+  std::unique_ptr<TileTaskManager> tile_task_manager_;
   TestGpuMemoryBufferManager gpu_memory_buffer_manager_;
   TestSharedBitmapManager shared_bitmap_manager_;
   SynchronousTaskGraphRunner task_graph_runner_;