clean up more dead code

tests/SkpSkGrTest.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.
  */
 
 #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 "SkTime.h"
 #include "Test.h"
 
 #if !SK_SUPPORT_GPU
 #error "GPU support required"
@@ skipping 100 matching lines @@
     SkpSkGrThreadedTestRunner(skiatest::Reporter* reporter)
         : fReporter(reporter) {
     }
 
     ~SkpSkGrThreadedTestRunner();
     void render();
     SkTDArray<SkpSkGrThreadedRunnable*> fRunnables;
     skiatest::Reporter* fReporter;
 };
 
-class SkpSkGrThreadedRunnable : public SkRunnable {
+class SkpSkGrThreadedRunnable {
 public:
     SkpSkGrThreadedRunnable(void (*testFun)(SkpSkGrThreadState*), int dirNo, const char* str,
             SkpSkGrThreadedTestRunner* runner) {
         SkASSERT(strlen(str) < sizeof(fState.fResult.fFilename) - 1);
         fState.init(dirNo);
         strcpy(fState.fResult.fFilename, str);
         fState.fReporter = runner->fReporter;
         fTestFun = testFun;
     }
 
-    void run() override {
+    void operator()() {
         SkGraphics::SetTLSFontCacheLimit(1 * 1024 * 1024);
         (*fTestFun)(&fState);
     }
 
     SkpSkGrThreadState fState;
     void (*fTestFun)(SkpSkGrThreadState*);
 };
 
 SkpSkGrThreadedTestRunner::~SkpSkGrThreadedTestRunner() {
     for (int index = 0; index < fRunnables.count(); index++) {
         delete fRunnables[index];
     }
 }
 
 void SkpSkGrThreadedTestRunner::render() {
-    // TODO: we don't really need to be using SkRunnables here anymore.
-    // We can just write the code we'd run right in the for loop.
     SkTaskGroup().batch(fRunnables.count(), [&](int i) {
-        fRunnables[i]->run();
+        fRunnables[i]();
     });
 }
 
 ////////////////////////////////////////////////
 
 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 565 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());
 }