Get rid of DEFINE_TESTCLASS_SHORT() macro.

tests/SkpSkGrTest.cpp

 #if !SK_SUPPORT_GPU
 #error "GPU support required"
 #endif
 
 #include "GrContext.h"
 #include "GrContextFactory.h"
 #include "GrRenderTarget.h"
 #include "SkGpuDevice.h"
 #include "gl/GrGLDefines.h"
 
 #include "SkBitmap.h"
 #include "SkColor.h"
 #include "SkDevice.h"
 #include "SkCanvas.h"
 #include "SkGraphics.h"
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkStream.h"
 #include "SkOSFile.h"
 #include "SkPicture.h"
 #include "SkRTConf.h"
 #include "SkRunnable.h"
 #include "SkString.h"
 #include "SkTArray.h"
 #include "SkTDArray.h"
 #include "SkThreadPool.h"
 #include "SkTime.h"
 #include "Test.h"
+#include "TestClassDef.h"
 
 #ifdef SK_BUILD_FOR_WIN
     #define PATH_SLASH "\\"
     #define IN_DIR "D:\\9-30-13\\"
     #define OUT_DIR "D:\\skpSkGr\\11\\"
     #define LINE_FEED "\r\n"
 #else
     #define PATH_SLASH "/"
     #define IN_DIR "/usr/local/google/home/caryclark" PATH_SLASH "9-30-13-skp"
     #define OUT_DIR "/media/01CD75512A7F9EE0/4" PATH_SLASH
-    #define LINE_FEED \n"
+    #define LINE_FEED "\n"
 #endif
 
 #define PATH_STR_SIZE 512
 
 static const struct {
     int directory;
     const char* filename;
 } skipOverSkGr[] = {
     {1, "http___accuweather_com_.skp"},  // Couldn't convert bitmap to texture.http___absoku072_com_
 };
@@ skipping 515 matching lines @@
 };
 
 static bool initTest() {
 #if !defined SK_BUILD_FOR_WIN && !defined SK_BUILD_FOR_MAC
     SK_CONF_SET("images.jpeg.suppressDecoderWarnings", true);
     SK_CONF_SET("images.png.suppressDecoderWarnings", true);
 #endif
     return make_out_dirs();
 }
 
-static void SkpSkGrTest(skiatest::Reporter* reporter) {
+DEF_TEST(SkpSkGr, reporter) {
     SkTArray<TestResult, true> errors;
     if (!initTest()) {
         return;
     }
     SkpSkGrThreadState state;
     state.init(0);
     int smallCount = 0;
     for (int dirNo = 1; dirNo <= 100; ++dirNo) {
         SkString pictDir = make_in_dir_name(dirNo);
         SkASSERT(pictDir.size());
@@ skipping 35 matching lines @@
                 } else if (++smallCount > 10000) {
                     goto breakOut;
                 }
             }
             ++testCount;
             if (reporter->verbose()) {
                 if (testCount % 100 == 0) {
                     SkDebugf("#%d\n", testCount);
                 }
             }
-    skipOver:
-            reporter->bumpTestCount();
+     skipOver:
+             reporter->bumpTestCount();
     checkEarlyExit:
             if (1 && testCount == 20) {
                 break;
             }
         }
     }
 breakOut:
     if (reporter->verbose()) {
         for (int index = 0; index < state.fFoundCount; ++index) {
             SkDebugf("%d %s %d\n", state.fDirsFound[index], state.fFilesFound[index],
@@ skipping 19 matching lines @@
         }
     }
 }
 
 static void testSkGrMain(SkpSkGrThreadState* data) {
     data->fResult.testOne();
     bumpCount(data->fReporter, false);
     data->fReporter->bumpTestCount();
 }
 
-static void SkpSkGrThreadedTest(skiatest::Reporter* reporter) {
+DEF_TEST(SkpSkGrThreaded, reporter) {
     if (!initTest()) {
         return;
     }
     int threadCount = reporter->allowThreaded() ? 3 : 1;
     SkpSkGrThreadedTestRunner testRunner(reporter, threadCount);
     for (int dirIndex = 1; dirIndex <= 100; ++dirIndex) {
         SkString pictDir = make_in_dir_name(dirIndex);
         if (pictDir.size() == 0) {
             continue;
         }
@@ skipping 46 matching lines @@
     TestResult encoder;
     encoder.fTestStep = kEncodeFiles;
     for (int index = 0; index < max.fFoundCount; ++index) {
         encoder.fDirNo = max.fDirsFound[index];
         strcpy(encoder.fFilename, max.fFilesFound[index]);
         encoder.testOne();
         SkDebugf("+");
     }
 }
 
-static void SkpSkGrOneOffTest(skiatest::Reporter* reporter) {
+DEF_TEST(SkpSkGrOneOff, reporter) {
     if (!initTest()) {
         return;
     }
     int testIndex = 166;
     int dirIndex = skipOverSkGr[testIndex - 166].directory;
     SkString pictDir = make_in_dir_name(dirIndex);
     if (pictDir.size() == 0) {
         return;
     }
     SkString filename(skipOverSkGr[testIndex - 166].filename);
     TestResult::Test(dirIndex, filename.c_str(), kCompareBits, reporter->verbose());
     TestResult::Test(dirIndex, filename.c_str(), kEncodeFiles, reporter->verbose());
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS_SHORT(SkpSkGrTest)
-
-DEFINE_TESTCLASS_SHORT(SkpSkGrOneOffTest)
-
-DEFINE_TESTCLASS_SHORT(SkpSkGrThreadedTest)