Get rid of DEFINE_TESTCLASS_SHORT() macro.

tests/PathOpsCubicToQuadsTest.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 "PathOpsCubicIntersectionTestData.h"
 #include "PathOpsQuadIntersectionTestData.h"
 #include "PathOpsTestCommon.h"
 #include "SkGeometry.h"
 #include "SkIntersections.h"
 #include "SkPathOpsRect.h"
 #include "SkReduceOrder.h"
 #include "Test.h"
+#include "TestClassDef.h"
 
 static void test(skiatest::Reporter* reporter, const SkDCubic* cubics, const char* name,
                  int firstTest, size_t testCount) {
     for (size_t index = firstTest; index < testCount; ++index) {
         const SkDCubic& cubic = cubics[index];
         SkASSERT(ValidCubic(cubic));
         double precision = cubic.calcPrecision();
         SkTArray<SkDQuad, true> quads;
         CubicToQuads(cubic, precision, quads);
         if (quads.count() != 1 && quads.count() != 2) {
@@ skipping 61 matching lines @@
             int last = quads.count() - 1;
             if (!AlmostEqualUlps(cubic[3].fX, quads[last][2].fX)
                     || !AlmostEqualUlps(cubic[3].fY, quads[last][2].fY)) {
                 SkDebugf("[%d][%d] unmatched end\n", static_cast<int>(index), idx2);
                 REPORTER_ASSERT(reporter, 0);
             }
         }
     }
 }
 
-static void CubicToQuads_Test(skiatest::Reporter* reporter) {
+DEF_TEST(CubicToQuads, reporter) {
     enum {
         RunAll,
         RunPointDegenerates,
         RunNotPointDegenerates,
         RunLines,
         RunNotLines,
         RunModEpsilonLines,
         RunLessEpsilonLines,
         RunNegEpsilonLines,
         RunQuadraticLines,
@@ skipping 73 matching lines @@
             {static_cast<float>(cubic[3].fX), static_cast<float>(cubic[3].fY)}};
     SkScalar skinflect[2];
     int skin = SkFindCubicInflections(skcubic, skinflect);
     if (false) SkDebugf("%s %d %1.9g\n", __FUNCTION__, skin, skinflect[0]);
     SkTArray<SkDQuad, true> quads;
     double precision = cubic.calcPrecision();
     CubicToQuads(cubic, precision, quads);
     if (false) SkDebugf("%s quads=%d\n", __FUNCTION__, quads.count());
 }
 
-static void CubicsToQuadratics_OneOffTests(skiatest::Reporter* reporter) {
+DEF_TEST(CubicsToQuadratics_OneOff_Loop, reporter) {
     for (size_t x = 0; x < localsCount; ++x) {
         oneOff(reporter, x);
     }
 }
 
-static void CubicsToQuadratics_OneOffTest(skiatest::Reporter* reporter) {
+DEF_TEST(CubicsToQuadratics_OneOff_Single, reporter) {
     oneOff(reporter, 0);
 }
-
-static void PathOpsCubicToQuadsTest(skiatest::Reporter* reporter) {
-    CubicToQuads_Test(reporter);
-    CubicsToQuadratics_OneOffTest(reporter);
-    CubicsToQuadratics_OneOffTests(reporter);
-}
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS_SHORT(PathOpsCubicToQuadsTest)