Revert of SkThreadPool ~~> SkTaskGroup

tests/SkpSkGrTest.cpp

 #if !SK_SUPPORT_GPU
 #error "GPU support required"
 #endif
 
 #include "GrContext.h"
 #include "GrContextFactory.h"
 #include "GrRenderTarget.h"
 #include "SkGpuDevice.h"
 #include "gl/GrGLDefines.h"
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
 #include "SkDevice.h"
 #include "SkGraphics.h"
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkOSFile.h"
 #include "SkPicture.h"
 #include "SkRTConf.h"
 #include "SkRunnable.h"
 #include "SkStream.h"
 #include "SkString.h"
 #include "SkTArray.h"
 #include "SkTDArray.h"
-#include "SkTaskGroup.h"
+#include "SkThreadPool.h"
 #include "SkTime.h"
 #include "Test.h"
 
 #ifdef SK_BUILD_FOR_WIN
     #define PATH_SLASH "\\"
     #define IN_DIR "D:\\9-30-13\\"
     #define OUT_DIR "D:\\skpSkGr\\11\\"
     #define LINE_FEED "\r\n"
 #else
     #define PATH_SLASH "/"
@@ skipping 81 matching lines @@
     char fFilesFound[kMaxFiles][kMaxLength];
     int fDirsFound[kMaxFiles];
     int fError[kMaxFiles];
     int fFoundCount;
     int fSmallestError;
     skiatest::Reporter* fReporter;
     TestResult fResult;
 };
 
 struct SkpSkGrThreadedTestRunner {
-    SkpSkGrThreadedTestRunner(skiatest::Reporter* reporter)
-        : fReporter(reporter) {
+    SkpSkGrThreadedTestRunner(skiatest::Reporter* reporter, int threadCount)
+        : fNumThreads(threadCount)
+        , fReporter(reporter) {
     }
 
     ~SkpSkGrThreadedTestRunner();
     void render();
+    int fNumThreads;
     SkTDArray<SkpSkGrThreadedRunnable*> fRunnables;
     skiatest::Reporter* fReporter;
 };
 
 class SkpSkGrThreadedRunnable : public SkRunnable {
 public:
     SkpSkGrThreadedRunnable(void (*testFun)(SkpSkGrThreadState*), int dirNo, const char* str,
             SkpSkGrThreadedTestRunner* runner) {
         SkASSERT(strlen(str) < sizeof(fState.fResult.fFilename) - 1);
         fState.init(dirNo);
@@ skipping 11 matching lines @@
     void (*fTestFun)(SkpSkGrThreadState*);
 };
 
 SkpSkGrThreadedTestRunner::~SkpSkGrThreadedTestRunner() {
     for (int index = 0; index < fRunnables.count(); index++) {
         SkDELETE(fRunnables[index]);
     }
 }
 
 void SkpSkGrThreadedTestRunner::render() {
-    SkTaskGroup tg;
+    SkThreadPool pool(fNumThreads);
     for (int index = 0; index < fRunnables.count(); ++ index) {
-        tg.add(fRunnables[index]);
+        pool.add(fRunnables[index]);
     }
 }
 
 ////////////////////////////////////////////////
 
 static const char outGrDir[] = OUT_DIR "grTest";
 static const char outSkDir[] = OUT_DIR "skTest";
 static const char outSkpDir[] = OUT_DIR "skpTest";
 static const char outDiffDir[] = OUT_DIR "outTest";
 static const char outStatusDir[] = OUT_DIR "statusTest";
@@ skipping 489 matching lines @@
 static void testSkGrMain(SkpSkGrThreadState* data) {
     data->fResult.testOne();
     bumpCount(data->fReporter, false);
     data->fReporter->bumpTestCount();
 }
 
 DEF_TEST(SkpSkGrThreaded, reporter) {
     if (!initTest()) {
         return;
     }
-    SkpSkGrThreadedTestRunner testRunner(reporter);
+    int threadCount = reporter->allowThreaded() ? 3 : 1;
+    SkpSkGrThreadedTestRunner testRunner(reporter, threadCount);
     for (int dirIndex = 1; dirIndex <= 100; ++dirIndex) {
         SkString pictDir = make_in_dir_name(dirIndex);
         if (pictDir.size() == 0) {
             continue;
         }
         SkOSFile::Iter iter(pictDir.c_str(), "skp");
         SkString filename;
         while (iter.next(&filename)) {
             SkString pngName = make_png_name(filename.c_str());
             SkString oldPng = make_filepath(dirIndex, outSkDir, pngName.c_str());
@@ skipping 55 matching lines @@
     int testIndex = 166;
     int dirIndex = skipOverSkGr[testIndex - 166].directory;
     SkString pictDir = make_in_dir_name(dirIndex);
     if (pictDir.size() == 0) {
         return;
     }
     SkString filename(skipOverSkGr[testIndex - 166].filename);
     TestResult::Test(dirIndex, filename.c_str(), kCompareBits, reporter->verbose());
     TestResult::Test(dirIndex, filename.c_str(), kEncodeFiles, reporter->verbose());
 }