Move macros from TestClassDef.h to Test.h

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
@@ skipping 704 matching lines @@
     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());
 }