Get rid of DEFINE_TESTCLASS_SHORT() macro.

tests/PathOpsSimplifyQuadralateralsThreadedTest.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 testSimplifyQuadralateralsMain(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));
     }
@@ skipping 49 matching lines @@
                     if (progress) {
                         outputProgress(state.fPathStr, pathStr, SkPath::kEvenOdd_FillType);
                     }
                     testSimplify(path, true, out, state, pathStr);
                 }
             }
         }
     }
 }
 
-static void PathOpsSimplifyQuadralateralsThreadedTest(skiatest::Reporter* reporter) {
+DEF_TEST(PathOpsSimplifyQuadralateralsThreaded, reporter) {
     int threadCount = initializeTests(reporter, "testQuadralaterals");
     PathOpsThreadedTestRunner testRunner(reporter, threadCount);
     for (int a = 0; a < 16; ++a) {
         for (int b = a ; b < 16; ++b) {
             for (int c = b ; c < 16; ++c) {
                 for (int d = c; d < 16; ++d) {
                     *testRunner.fRunnables.append() = SkNEW_ARGS(PathOpsThreadedRunnable,
                             (&testSimplifyQuadralateralsMain, a, b, c, d, &testRunner));
                 }
                 if (!reporter->allowExtendedTest()) goto finish;
             }
         }
     }
 finish:
     testRunner.render();
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS_SHORT(PathOpsSimplifyQuadralateralsThreadedTest)