Move threadpool code from include/utils to tools/threadpool.

tests/skia_test.cpp

Index: tests/skia_test.cpp
diff --git a/tests/skia_test.cpp b/tests/skia_test.cpp
index f4b67c9bc40f4df6d3821096e5ee587b89b2e997..c89083a3cb0d45229875747681c65a22473fefeb 100644
--- a/tests/skia_test.cpp
+++ b/tests/skia_test.cpp
@@ -13,7 +13,7 @@
 #include "SkOSFile.h"
 #include "SkTArray.h"
 #include "SkTemplates.h"
-#include "SkThreadPool.h"
+#include "ThreadPool.h"
 #include "SkTime.h"
 #include "Test.h"
 
@@ -39,7 +39,7 @@ DEFINE_bool2(verbose, v, false, "enable verbose output from the test driver.");
 DEFINE_bool2(veryVerbose, V, false, "tell individual tests to be verbose.");
 DEFINE_bool(cpu, true, "whether or not to run CPU tests.");
 DEFINE_bool(gpu, true, "whether or not to run GPU tests.");
-DEFINE_int32(threads, SkThreadPool::kThreadPerCore,
+DEFINE_int32(threads, ThreadPool::kThreadPerCore,
              "Run threadsafe tests on a threadpool with this many threads.");
 
 // need to explicitly declare this, or we get some weird infinite loop llist
@@ -100,7 +100,7 @@ private:
 };
 
 // Deletes self when run.
-class SkTestRunnable : public SkRunnable {
+class SkTestRunnable : public Runnable {
 public:
   // Takes ownership of test.
   SkTestRunnable(Test* test, int32_t* failCount) : fTest(test), fFailCount(failCount) {}
@@ -193,7 +193,7 @@ int tool_main(int argc, char** argv) {
     int32_t failCount = 0;
     int skipCount = 0;
 
-    SkThreadPool threadpool(FLAGS_threads);
+    ThreadPool threadpool(FLAGS_threads);
     SkTArray<Test*> gpuTests;  // Always passes ownership to an SkTestRunnable
 
     DebugfReporter reporter(toRun);