Get rid of DEFINE_TESTCLASS_SHORT() macro.

tests/PathOpsSimplifyRectThreadedTest.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 "PathOpsThreadedCommon.h"
+#include "TestClassDef.h"
 
 // four rects, of four sizes
 // for 3 smaller sizes, tall, wide
     // top upper mid lower bottom aligned (3 bits, 5 values)
     // same with x (3 bits, 5 values)
 // not included, square, tall, wide (2 bits)
 // cw or ccw (1 bit)
 
 static void testSimplify4x4RectsMain(PathOpsThreadState* data)
 {
@@ skipping 160 matching lines @@
     }
                             }
                         }
                     }
                 }
             }
         }
     }
 }
 
-static void PathOpsSimplifyRectsThreadedTest(skiatest::Reporter* reporter)
-{
+DEF_TEST(PathOpsSimplifyRectsThreaded, reporter) {
     int threadCount = initializeTests(reporter, "testLine");
     PathOpsThreadedTestRunner testRunner(reporter, threadCount);
     for (int a = 0; a < 8; ++a) {  // outermost
         for (int b = a ; b < 8; ++b) {
             for (int c = b ; c < 8; ++c) {
                 for (int d = c; d < 8; ++d) {
                         *testRunner.fRunnables.append() = SkNEW_ARGS(PathOpsThreadedRunnable,
                                 (&testSimplify4x4RectsMain, a, b, c, d, &testRunner));
                 }
                 if (!reporter->allowExtendedTest()) goto finish;
             }
         }
     }
 finish:
     testRunner.render();
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS_SHORT(PathOpsSimplifyRectsThreadedTest)