Get rid of DEFINE_TESTCLASS_SHORT() macro.

tests/PathOpsBoundsTest.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 "SkPathOpsBounds.h"
 #include "Test.h"
+#include "TestClassDef.h"
 
 static const SkRect sectTests[][2] = {
     {{2, 0, 4, 1}, {4, 0, 6, 1}},
     {{2, 0, 4, 1}, {3, 0, 5, 1}},
     {{2, 0, 4, 1}, {3, 0, 5, 0}},
     {{2, 0, 4, 1}, {3, 1, 5, 2}},
     {{2, 1, 4, 2}, {1, 0, 5, 3}},
     {{2, 1, 5, 3}, {3, 1, 4, 2}},
     {{2, 0, 4, 1}, {3, 0, 3, 0}},  // intersecting an empty bounds is OK
     {{2, 0, 4, 1}, {4, 1, 5, 2}},  // touching just on a corner is OK
@@ skipping 19 matching lines @@
 static const size_t emptyTestsCount = SK_ARRAY_COUNT(reallyEmpty);
 
 static const SkRect notReallyEmpty[] = {
     {0, 0, 1, 0},
     {0, 0, 0, 1},
     {0, 0, 1, 1},
 };
 
 static const size_t notEmptyTestsCount = SK_ARRAY_COUNT(notReallyEmpty);
 
-static void PathOpsBoundsTest(skiatest::Reporter* reporter) {
+DEF_TEST(PathOpsBounds, reporter) {
     for (size_t index = 0; index < sectTestsCount; ++index) {
         const SkPathOpsBounds& bounds1 = static_cast<const SkPathOpsBounds&>(sectTests[index][0]);
         SkASSERT(ValidBounds(bounds1));
         const SkPathOpsBounds& bounds2 = static_cast<const SkPathOpsBounds&>(sectTests[index][1]);
         SkASSERT(ValidBounds(bounds2));
         bool touches = SkPathOpsBounds::Intersects(bounds1, bounds2);
         REPORTER_ASSERT(reporter, touches);
     }
     for (size_t index = 0; index < noSectTestsCount; ++index) {
         const SkPathOpsBounds& bounds1 = static_cast<const SkPathOpsBounds&>(noSectTests[index][0]);
@@ skipping 41 matching lines @@
     expected.set(0, 0, 3, 4);
     REPORTER_ASSERT(reporter, bounds == expected);
     (bounds.*SetCurveBounds[2])(curvePts);
     REPORTER_ASSERT(reporter, bounds == expected);
     bounds.setCubicBounds(curvePts);
     expected.set(0, 0, 5, 6);
     REPORTER_ASSERT(reporter, bounds == expected);
     (bounds.*SetCurveBounds[3])(curvePts);
     REPORTER_ASSERT(reporter, bounds == expected);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS_SHORT(PathOpsBoundsTest)