Get rid of DEFINE_TESTCLASS_SHORT() macro.

tests/PathOpsSimplifyFailTest.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 "SkPathOps.h"
 #include "SkPath.h"
 #include "SkPoint.h"
 #include "Test.h"
+#include "TestClassDef.h"
 
 static const SkPoint nonFinitePts[] = {
     { SK_ScalarInfinity, 0 },
     { 0, SK_ScalarInfinity },
     { SK_ScalarInfinity, SK_ScalarInfinity },
     { SK_ScalarNegativeInfinity, 0},
     { 0, SK_ScalarNegativeInfinity },
     { SK_ScalarNegativeInfinity, SK_ScalarNegativeInfinity },
     { SK_ScalarNegativeInfinity, SK_ScalarInfinity },
     { SK_ScalarInfinity, SK_ScalarNegativeInfinity },
@@ skipping 63 matching lines @@
         case 10: path.moveTo(finitePts[f]); break;
     }
     SkPath result;
     result.setFillType(SkPath::kWinding_FillType);
     bool success = Simplify(path, &result);
     REPORTER_ASSERT(reporter, success);
     REPORTER_ASSERT(reporter, result.getFillType() != SkPath::kWinding_FillType);
     reporter->bumpTestCount();
 }
 
-static void PathOpsSimplifyFailTest(skiatest::Reporter* reporter) {
+DEF_TEST(PathOpsSimplifyFail, reporter) {
     for (int index = 0; index < (int) (13 * nonFinitePtsCount * finitePtsCount); ++index) {
         failOne(reporter, index);
     }
     for (int index = 0; index < (int) (11 * finitePtsCount); ++index) {
         dontFailOne(reporter, index);
     }
 }
 
-static void PathOpsSimplifyFailOneTest(skiatest::Reporter* reporter) {
+DEF_TEST(PathOpsSimplifyFailOne, reporter) {
     int index = 0;
     failOne(reporter, index);
 }
 
-static void PathOpsSimplifyDontFailOneTest(skiatest::Reporter* reporter) {
+DEF_TEST(PathOpsSimplifyDontFailOne, reporter) {
     int index = 6;
     dontFailOne(reporter, index);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS_SHORT(PathOpsSimplifyFailTest)
-
-DEFINE_TESTCLASS_SHORT(PathOpsSimplifyFailOneTest)
-
-DEFINE_TESTCLASS_SHORT(PathOpsSimplifyDontFailOneTest)