TaskGraphRunner refactor

content/renderer/raster_worker_pool_unittest.cc

 // Copyright 2015 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 "base/test/sequenced_task_runner_test_template.h"
 #include "base/test/task_runner_test_template.h"
 #include "base/threading/simple_thread.h"
+#include "cc/test/task_graph_runner_test_template.h"
 #include "content/renderer/raster_worker_pool.h"
 
 namespace base {
 namespace {
 
 // Number of threads spawned in tests.
 const int kNumThreads = 4;
 
 class RasterWorkerPoolTestDelegate {
  public:
   RasterWorkerPoolTestDelegate()
       : raster_worker_pool_(new content::RasterWorkerPool()) {}
 
   void StartTaskRunner() {
     raster_worker_pool_->Start(kNumThreads, SimpleThread::Options());
   }
 
   scoped_refptr<content::RasterWorkerPool> GetTaskRunner() {
     return raster_worker_pool_;
   }
 
-  void StopTaskRunner() {
-    raster_worker_pool_->GetTaskGraphRunner()->FlushForTesting();
-  }
+  void StopTaskRunner() { raster_worker_pool_->FlushForTesting(); }
 
   ~RasterWorkerPoolTestDelegate() { raster_worker_pool_->Shutdown(); }
 
  private:
   scoped_refptr<content::RasterWorkerPool> raster_worker_pool_;
 };
 
 INSTANTIATE_TYPED_TEST_CASE_P(RasterWorkerPool,
                               TaskRunnerTest,
                               RasterWorkerPoolTestDelegate);
 
 class RasterWorkerPoolSequencedTestDelegate {
  public:
   RasterWorkerPoolSequencedTestDelegate()
       : raster_worker_pool_(new content::RasterWorkerPool()) {}
 
   void StartTaskRunner() {
     raster_worker_pool_->Start(kNumThreads, SimpleThread::Options());
   }
 
   scoped_refptr<base::SequencedTaskRunner> GetTaskRunner() {
     return raster_worker_pool_->CreateSequencedTaskRunner();
   }
 
-  void StopTaskRunner() {
-    raster_worker_pool_->GetTaskGraphRunner()->FlushForTesting();
-  }
+  void StopTaskRunner() { raster_worker_pool_->FlushForTesting(); }
 
   ~RasterWorkerPoolSequencedTestDelegate() { raster_worker_pool_->Shutdown(); }
 
  private:
   scoped_refptr<content::RasterWorkerPool> raster_worker_pool_;
 };
 
 INSTANTIATE_TYPED_TEST_CASE_P(RasterWorkerPool,
                               SequencedTaskRunnerTest,
                               RasterWorkerPoolSequencedTestDelegate);
 
 }  // namespace
 }  // namespace base
+
+namespace cc {
+namespace {
+
+template <int NumThreads>
+class RasterWorkerPoolTaskGraphRunnerTestDelegate {
+ public:
+  RasterWorkerPoolTaskGraphRunnerTestDelegate()
+      : raster_worker_pool_(new content::RasterWorkerPool()) {}
+
+  void StartTaskGraphRunner() {
+    raster_worker_pool_->Start(NumThreads, base::SimpleThread::Options());
+  }
+
+  cc::TaskGraphRunner* GetTaskGraphRunner() {
+    return raster_worker_pool_->GetTaskGraphRunner();
+  }
+
+  void StopTaskGraphRunner() { raster_worker_pool_->FlushForTesting(); }
+
+  ~RasterWorkerPoolTaskGraphRunnerTestDelegate() {
+    raster_worker_pool_->Shutdown();
+  }
+
+ private:
+  scoped_refptr<content::RasterWorkerPool> raster_worker_pool_;
+};
+
+// Multithreaded tests.
+INSTANTIATE_TYPED_TEST_CASE_P(RasterWorkerPool_1_Threads,
+                              TaskGraphRunnerTest,
+                              RasterWorkerPoolTaskGraphRunnerTestDelegate<1>);
+INSTANTIATE_TYPED_TEST_CASE_P(RasterWorkerPool_2_Threads,
+                              TaskGraphRunnerTest,
+                              RasterWorkerPoolTaskGraphRunnerTestDelegate<2>);
+INSTANTIATE_TYPED_TEST_CASE_P(RasterWorkerPool_3_Threads,
+                              TaskGraphRunnerTest,
+                              RasterWorkerPoolTaskGraphRunnerTestDelegate<3>);
+INSTANTIATE_TYPED_TEST_CASE_P(RasterWorkerPool_4_Threads,
+                              TaskGraphRunnerTest,
+                              RasterWorkerPoolTaskGraphRunnerTestDelegate<4>);
+INSTANTIATE_TYPED_TEST_CASE_P(RasterWorkerPool_5_Threads,
+                              TaskGraphRunnerTest,
+                              RasterWorkerPoolTaskGraphRunnerTestDelegate<5>);
+
+// Single threaded tests.
+INSTANTIATE_TYPED_TEST_CASE_P(RasterWorkerPool,
+                              SingleThreadTaskGraphRunnerTest,
+                              RasterWorkerPoolTaskGraphRunnerTestDelegate<1>);
+
+}  // namespace
+}  // namespace cc