Get rid of DEFINE_TESTCLASS_SHORT() macro.

tests/PathOpsSkpTest.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 skpcheeseandburger_com225(skiatest::Reporter* reporter) {
     SkPath path;
     path.setFillType(SkPath::kEvenOdd_FillType);
     path.moveTo(555, 468);
     path.lineTo(555, 362);
     path.lineTo(872, 362);
     path.lineTo(872, 468);
     path.lineTo(555, 468);
@@ skipping 1631 matching lines @@
     TEST(skpflite_com41),
     TEST(skpcheeseandburger_com225),
     TEST(skpeverytechpro_blogspot_com100),
 };
 
 static const size_t testCount = SK_ARRAY_COUNT(tests);
 
 static bool runReverse = false;
 static void (*stopTest)(skiatest::Reporter* ) = 0;
 
-static void PathOpsSkpTest(skiatest::Reporter* reporter) {
+DEF_TEST(PathOpsSkp, reporter) {
 #if DEBUG_SHOW_TEST_NAME
     strncpy(DEBUG_FILENAME_STRING, "", DEBUG_FILENAME_STRING_LENGTH);
 #endif
     RunTestSet(reporter, tests, testCount, firstTest, stopTest, runReverse);
 }
-
-#include "TestClassDef.h"
-
-DEFINE_TESTCLASS_SHORT(PathOpsSkpTest)