Get rid of DEFINE_TESTCLASS_SHORT() macro.

tests/PathOpsQuadLineIntersectionTest.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 "PathOpsTestCommon.h"
 #include "SkIntersections.h"
 #include "SkPathOpsLine.h"
 #include "SkPathOpsQuad.h"
 #include "SkReduceOrder.h"
 #include "Test.h"
+#include "TestClassDef.h"
 
 static struct lineQuad {
     SkDQuad quad;
     SkDLine line;
     int result;
     SkDPoint expected[2];
 } lineQuadTests[] = {
     //        quad                    line                  results
     {{{{1, 1}, {2, 1}, {0, 2}}}, {{{0, 0}, {1, 1}}},  1,  {{1, 1}, {0, 0}} },
     {{{{0, 0}, {1, 1}, {3, 1}}}, {{{0, 0}, {3, 1}}},  2,  {{0, 0}, {3, 1}} },
@@ skipping 66 matching lines @@
             SkDPoint lineXY = line.ptAtT(lineT);
             if (!quadXY.approximatelyEqual(lineXY)) {
                 quadXY.approximatelyEqual(lineXY);
                 SkDebugf("");
             }
             REPORTER_ASSERT(reporter, quadXY.approximatelyEqual(lineXY));
         }
     }
 }
 
-static void PathOpsQuadLineIntersectionOneOffTest(skiatest::Reporter* reporter) {
+DEF_TEST(PathOpsQuadLineIntersectionOneOff, reporter) {
     testOneOffs(reporter);
 }
 
-static void PathOpsQuadLineIntersectionTest(skiatest::Reporter* reporter) {
+DEF_TEST(PathOpsQuadLineIntersection, reporter) {
     for (size_t index = 0; index < lineQuadTests_count; ++index) {
         int iIndex = static_cast<int>(index);
         const SkDQuad& quad = lineQuadTests[index].quad;
         SkASSERT(ValidQuad(quad));
         const SkDLine& line = lineQuadTests[index].line;
         SkASSERT(ValidLine(line));
         SkReduceOrder reducer1, reducer2;
         int order1 = reducer1.reduce(quad);
         int order2 = reducer2.reduce(line);
         if (order1 < 3) {
@@ skipping 25 matching lines @@
             }
             if (!t1.approximatelyEqual(lineQuadTests[index].expected[0])
                     && (lineQuadTests[index].result == 1
                     || !t1.approximatelyEqual(lineQuadTests[index].expected[1]))) {
                 SkDebugf("%s t1=(%1.9g,%1.9g)\n", __FUNCTION__, t1.fX, t1.fY);
                 REPORTER_ASSERT(reporter, 0);
             }
         }
     }
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS_SHORT(PathOpsQuadLineIntersectionTest)
-
-DEFINE_TESTCLASS_SHORT(PathOpsQuadLineIntersectionOneOffTest)