Revert of SkThreadPool ~~> SkTaskGroup

tools/skpdiff/skpdiff_main.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // TODO(djsollen): Rename this whole package (perhaps to "SkMultiDiffer").
 // It's not just for "pdiff" (perceptual diffs)--it's a harness that allows
 // the execution of an arbitrary set of difference algorithms.
 // See http://skbug.com/2711 ('rename skpdiff')
 
 #if SK_SUPPORT_OPENCL
 
 #define __NO_STD_VECTOR // Uses cl::vectpr instead of std::vectpr
 #define __NO_STD_STRING // Uses cl::STRING_CLASS instead of std::string
 #if SK_BUILD_FOR_MAC
 // Note that some macs don't have this header and it can be downloaded from the Khronos registry
 #   include <OpenCL/cl.hpp>
 #else
 #   include <CL/cl.hpp>
 #endif
 
 #endif
 
 #include "SkCommandLineFlags.h"
 #include "SkGraphics.h"
 #include "SkStream.h"
 #include "SkTDArray.h"
-#include "SkTaskGroup.h"
 
 #include "SkDifferentPixelsMetric.h"
 #include "SkDiffContext.h"
 #include "SkImageDiffer.h"
 #include "SkPMetric.h"
 #include "skpdiff_util.h"
 
 #include "SkForceLinking.h"
 __SK_FORCE_IMAGE_DECODER_LINKING;
 
@@ skipping 78 matching lines @@
 SkImageDiffer* gDiffers[] = { &gDiffPixel, &gPDiff, NULL };
 
 int tool_main(int argc, char * argv[]);
 int tool_main(int argc, char * argv[]) {
     // Setup command line parsing
     SkCommandLineFlags::SetUsage("Compare images using various metrics.");
     SkCommandLineFlags::Parse(argc, argv);
 
     // Needed by various Skia components
     SkAutoGraphics ag;
-    SkTaskGroup::Enabler enabled;
 
     if (FLAGS_list) {
         SkDebugf("Available Metrics:\n");
     }
 
     // Figure which differs the user chose, and optionally print them if the user requests it
     SkTDArray<SkImageDiffer*> chosenDiffers;
     for (int differIndex = 0; NULL != gDiffers[differIndex]; differIndex++) {
         SkImageDiffer* differ = gDiffers[differIndex];
         if (FLAGS_list) {
@@ skipping 117 matching lines @@
     }
 
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char * argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif