Get rid of DEFINE_TESTCLASS_SHORT() macro.

tests/PathOpsSimplifyDegenerateThreadedTest.cpp

Index: tests/PathOpsSimplifyDegenerateThreadedTest.cpp
diff --git a/tests/PathOpsSimplifyDegenerateThreadedTest.cpp b/tests/PathOpsSimplifyDegenerateThreadedTest.cpp
index 9ed1f3a031ef1d05358aa581082ffebaaffa5015..5e2ad04771451b7c65087b3f9f9fce7e197c048d 100755
--- a/tests/PathOpsSimplifyDegenerateThreadedTest.cpp
+++ b/tests/PathOpsSimplifyDegenerateThreadedTest.cpp
@@ -6,6 +6,7 @@
  */
 #include "PathOpsExtendedTest.h"
 #include "PathOpsThreadedCommon.h"
+#include "TestClassDef.h"
 
 static void testSimplifyDegeneratesMain(PathOpsThreadState* data) {
     SkASSERT(data);
@@ -67,7 +68,7 @@ static void testSimplifyDegeneratesMain(PathOpsThreadState* data) {
     }
 }
 
-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) {
@@ -90,6 +91,3 @@ static void PathOpsSimplifyDegeneratesThreadedTest(skiatest::Reporter* reporter)
 finish:
     testRunner.render();
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS_SHORT(PathOpsSimplifyDegeneratesThreadedTest)