Get rid of DEFINE_TESTCLASS_SHORT() macro.

tests/PathOpsCubicQuadIntersectionTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "PathOpsTestCommon.h"
 #include "SkIntersections.h"
 #include "SkPathOpsCubic.h"
 #include "SkPathOpsQuad.h"
 #include "SkReduceOrder.h"
 #include "Test.h"
+#include "TestClassDef.h"
 
 static struct lineCubic {
     SkDCubic cubic;
     SkDQuad quad;
     int answerCount;
     SkDPoint answers[2];
 } quadCubicTests[] = {
     {{{{778, 14089}, {778, 14091.208984375}, {776.20916748046875, 14093}, {774, 14093}}},
      {{{778, 14089}, {777.99957275390625, 14090.65625}, {776.82843017578125, 14091.828125}}}, 2,
      {{778, 14089}, {776.82855609581270,14091.828250841330}}},
@@ skipping 20 matching lines @@
      {{{18,226}, {14.686291694641113,226}, {12.342399597167969,228.3424072265625}}}, 1,
       {{18,226}, {0,0}}},
 
     {{{{10,234}, {10,229.58172607421875}, {13.581720352172852,226}, {18,226}}},
      {{{12.342399597167969,228.3424072265625}, {10,230.68629455566406}, {10,234}}}, 1,
       {{10,234}, {0,0}}},
 };
 
 static const size_t quadCubicTests_count = SK_ARRAY_COUNT(quadCubicTests);
 
-static void PathOpsCubicQuadIntersectionTest(skiatest::Reporter* reporter) {
+DEF_TEST(PathOpsCubicQuadIntersection, reporter) {
     for (size_t index = 0; index < quadCubicTests_count; ++index) {
         int iIndex = static_cast<int>(index);
         const SkDCubic& cubic = quadCubicTests[index].cubic;
         SkASSERT(ValidCubic(cubic));
         const SkDQuad& quad = quadCubicTests[index].quad;
         SkASSERT(ValidQuad(quad));
         SkReduceOrder reduce1;
         SkReduceOrder reduce2;
         int order1 = reduce1.reduce(cubic, SkReduceOrder::kNo_Quadratics);
         int order2 = reduce2.reduce(quad);
@@ skipping 24 matching lines @@
             }
             if (!found) {
                 SkDebugf("%s [%d,%d] xy1=(%g,%g) != \n",
                     __FUNCTION__, iIndex, pt, xy1.fX, xy1.fY);
             }
             REPORTER_ASSERT(reporter, found);
         }
         reporter->bumpTestCount();
     }
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS_SHORT(PathOpsCubicQuadIntersectionTest)