Get rid of DEFINE_TESTCLASS_SHORT() macro.

tests/PathOpsOpCubicThreadedTest.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"
 
-static void testOpCubicsMain(PathOpsThreadState* data)
-{
+static void testOpCubicsMain(PathOpsThreadState* data) {
 #if DEBUG_SHOW_TEST_NAME
     strncpy(DEBUG_FILENAME_STRING, "", DEBUG_FILENAME_STRING_LENGTH);
 #endif
     SkASSERT(data);
     PathOpsThreadState& state = *data;
     char pathStr[1024];  // gdb: set print elements 400
     bool progress = state.fReporter->verbose(); // FIXME: break out into its own parameter?
     if (progress) {
         sk_bzero(pathStr, sizeof(pathStr));
     }
@@ skipping 38 matching lines @@
             testThreadedPathOp(state.fReporter, pathA, pathB, (SkPathOp) op);
         }
     }
                     }
                 }
             }
         }
     }
 }
 
-static void PathOpsOpCubicsThreadedTest(skiatest::Reporter* reporter)
-{
+DEF_TEST(PathOpsOpCubicsThreaded, reporter) {
     int threadCount = initializeTests(reporter, "cubicOp");
     PathOpsThreadedTestRunner testRunner(reporter, threadCount);
     for (int a = 0; a < 6; ++a) {  // outermost
         for (int b = a + 1; b < 7; ++b) {
             for (int c = 0 ; c < 6; ++c) {
                 for (int d = c + 1; d < 7; ++d) {
                     *testRunner.fRunnables.append() = SkNEW_ARGS(PathOpsThreadedRunnable,
                             (&testOpCubicsMain, a, b, c, d, &testRunner));
                 }
             }
             if (!reporter->allowExtendedTest()) goto finish;
         }
     }
 finish:
     testRunner.render();
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS_SHORT(PathOpsOpCubicsThreadedTest)