Re-land: cc: Remove WorkerPool class and instead use TaskGraphRunner directly.

cc/resources/raster_worker_pool_perftest.cc

 // Copyright 2013 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/resources/raster_worker_pool.h"
 
 #include "base/time/time.h"
 #include "cc/test/lap_timer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/perf/perf_test.h"
+#include "third_party/khronos/GLES2/gl2.h"
 
 namespace cc {
 
 namespace {
 
 static const int kTimeLimitMillis = 2000;
 static const int kWarmupRuns = 5;
 static const int kTimeCheckInterval = 10;
 
 class PerfWorkerPoolTaskImpl : public internal::WorkerPoolTask {
  public:
+  // Overridden from internal::Task:
+  virtual void RunOnWorkerThread(unsigned thread_index) OVERRIDE {}
+
   // Overridden from internal::WorkerPoolTask:
-  virtual void RunOnWorkerThread(unsigned thread_index) OVERRIDE {}
   virtual void CompleteOnOriginThread() OVERRIDE {}
 
  private:
   virtual ~PerfWorkerPoolTaskImpl() {}
 };
 
 class PerfRasterWorkerPool : public RasterWorkerPool {
  public:
   PerfRasterWorkerPool() : RasterWorkerPool(NULL, NULL) {}
   virtual ~PerfRasterWorkerPool() {}
 
   static scoped_ptr<PerfRasterWorkerPool> Create() {
     return make_scoped_ptr(new PerfRasterWorkerPool);
   }
 
   // Overridden from RasterWorkerPool:
   virtual void ScheduleTasks(RasterTask::Queue* queue) OVERRIDE {
     NOTREACHED();
   }
-  virtual GLenum GetResourceTarget() const OVERRIDE {
+  virtual unsigned GetResourceTarget() const OVERRIDE {
     NOTREACHED();
     return GL_TEXTURE_2D;
   }
   virtual ResourceFormat GetResourceFormat() const OVERRIDE {
     NOTREACHED();
     return RGBA_8888;
   }
   virtual void OnRasterTasksFinished() OVERRIDE {
     NOTREACHED();
   }
@@ skipping 163 matching lines @@
   RunBuildTaskGraphTest("100_4", 100, 4);
   RunBuildTaskGraphTest("1000_4", 1000, 4);
   RunBuildTaskGraphTest("10_16", 10, 16);
   RunBuildTaskGraphTest("100_16", 100, 16);
   RunBuildTaskGraphTest("1000_16", 1000, 16);
 }
 
 }  // namespace
 
 }  // namespace cc