Get rid of DEFINE_TESTCLASS_SHORT() macro.

tests/PathOpsSimplifyTest.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 "TestClassDef.h"
 
 #define TEST(name) { name, #name }
 
 static void testLine1(skiatest::Reporter* reporter) {
     SkPath path;
     path.moveTo(2,0);
     path.lineTo(1,1);
     path.lineTo(0,0);
     path.close();
     testSimplify(reporter, path);
@@ skipping 4312 matching lines @@
 };
 
 static const size_t subTestCount = SK_ARRAY_COUNT(subTests);
 
 static void (*firstSubTest)(skiatest::Reporter* ) = 0;
 
 static bool runSubTestsFirst = false;
 static bool runReverse = false;
 static void (*stopTest)(skiatest::Reporter* ) = 0;
 
-static void PathOpsSimplifyTest(skiatest::Reporter* reporter) {
+DEF_TEST(PathOpsSimplify, reporter) {
 #ifdef SK_DEBUG
     SkPathOpsDebug::gMaxWindSum = 4;
     SkPathOpsDebug::gMaxWindValue = 4;
 #endif
     if (runSubTestsFirst) {
         RunTestSet(reporter, subTests, subTestCount, firstSubTest, stopTest, runReverse);
     }
     RunTestSet(reporter, tests, testCount, firstTest, stopTest, runReverse);
     if (!runSubTestsFirst) {
         RunTestSet(reporter, subTests, subTestCount, firstSubTest, stopTest, runReverse);
     }
 #ifdef SK_DEBUG
     SkPathOpsDebug::gMaxWindSum = SK_MaxS32;
     SkPathOpsDebug::gMaxWindValue = SK_MaxS32;
 #endif
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS_SHORT(PathOpsSimplifyTest)