Get rid of DEFINE_TESTCLASS_SHORT() macro.

tests/PathOpsSimplifyDegenerateThreadedTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "PathOpsExtendedTest.h"
 #include "PathOpsThreadedCommon.h"
+#include "TestClassDef.h"
 
 static void testSimplifyDegeneratesMain(PathOpsThreadState* data) {
     SkASSERT(data);
     PathOpsThreadState& state = *data;
     char pathStr[1024];
     bool progress = state.fReporter->verbose(); // FIXME: break out into its own parameter?
     if (progress) {
         sk_bzero(pathStr, sizeof(pathStr));
     }
     int ax = state.fA & 0x03;
@@ skipping 41 matching lines @@
                 path.setFillType(SkPath::kEvenOdd_FillType);
                 if (progress) {
                     outputProgress(state.fPathStr, pathStr, SkPath::kEvenOdd_FillType);
                 }
                 testSimplify(path, true, out, state, pathStr);
             }
         }
     }
 }
 
-static void PathOpsSimplifyDegeneratesThreadedTest(skiatest::Reporter* reporter) {
+DEF_TEST(PathOpsSimplifyDegeneratesThreaded, reporter) {
     int threadCount = initializeTests(reporter, "testDegenerates");
     PathOpsThreadedTestRunner testRunner(reporter, threadCount);
     for (int a = 0; a < 16; ++a) {
         int ax = a & 0x03;
         int ay = a >> 2;
         for (int b = a ; b < 16; ++b) {
             int bx = b & 0x03;
             int by = b >> 2;
             for (int c = a ; c < 16; ++c) {
                 int cx = c & 0x03;
                 int cy = c >> 2;
                 bool abcIsATriangle = (bx - ax) * (cy - ay) != (by - ay) * (cx - ax);
                 *testRunner.fRunnables.append() = SkNEW_ARGS(PathOpsThreadedRunnable,
                         (&testSimplifyDegeneratesMain, a, b, c, abcIsATriangle,
                         &testRunner));
             }
             if (!reporter->allowExtendedTest()) goto finish;
         }
     }
 finish:
     testRunner.render();
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS_SHORT(PathOpsSimplifyDegeneratesThreadedTest)