Get rid of DEFINE_TESTCLASS_SHORT() macro.

tests/PathOpsQuadLineIntersectionThreadedTest.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 "SkIntersections.h"
 #include "SkPathOpsLine.h"
 #include "SkPathOpsQuad.h"
 #include "SkReduceOrder.h"
+#include "TestClassDef.h"
 
 static int doIntersect(SkIntersections& intersections, const SkDQuad& quad, const SkDLine& line,
                        bool& flipped) {
     int result;
     flipped = false;
     if (line[0].fX == line[1].fX) {
         double top = line[0].fY;
         double bottom = line[1].fY;
         flipped = top > bottom;
         if (flipped) {
@@ skipping 81 matching lines @@
                 testLineIntersect(state.fReporter, quad, line2, x, y);
                 state.fReporter->bumpTestCount();
                 SkDLine line3 = {{{x - h, y - v}, {x + h, y + v}}};
                 testLineIntersect(state.fReporter, quad, line3, x, y);
                 state.fReporter->bumpTestCount();
             }
         }
     }
 }
 
-static void PathOpsQuadLineIntersectionThreadedTest(skiatest::Reporter* reporter)
-{
+DEF_TEST(PathOpsQuadLineIntersectionThreaded, reporter) {
     int threadCount = initializeTests(reporter, "testQuadLineIntersect");
     PathOpsThreadedTestRunner testRunner(reporter, threadCount);
     for (int a = 0; a < 16; ++a) {
         for (int b = 0 ; b < 16; ++b) {
             for (int c = 0 ; c < 16; ++c) {
                     *testRunner.fRunnables.append() = SkNEW_ARGS(PathOpsThreadedRunnable,
                             (&testQuadLineIntersectMain, a, b, c, 0, &testRunner));
             }
             if (!reporter->allowExtendedTest()) goto finish;
         }
     }
 finish:
     testRunner.render();
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS_SHORT(PathOpsQuadLineIntersectionThreadedTest)