Move macros from TestClassDef.h to Test.h

tests/ARGBImageEncoderTest.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 "SkImageEncoder.h"
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkStream.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static SkBitmap::Config configs[] = {
     SkBitmap::kRGB_565_Config,
     SkBitmap::kARGB_8888_Config,
 };
 
 DEF_TEST(ARGBImageEncoder, reporter) {
     // Bytes we expect to get:
     const int kWidth = 3;
     const int kHeight = 5;
@@ skipping 29 matching lines @@
         SkAutoMalloc pixelBufferManager(bufferSize);
         char *pixelBuffer = static_cast<char *>(pixelBufferManager.get());
         SkMemoryWStream out(pixelBuffer, bufferSize);
         REPORTER_ASSERT(reporter, enc->encodeStream(&out, bitmap, SkImageEncoder::kDefaultQuality));
 
         // Confirm we got the expected results.
         REPORTER_ASSERT(reporter, bufferSize == sizeof(comparisonBuffer));
         REPORTER_ASSERT(reporter, memcmp(pixelBuffer, comparisonBuffer, bufferSize) == 0);
     }
 }