Move macros from TestClassDef.h to Test.h

Motivation: those macros don't make any sense without the definitions
in Test.h.

BUG=
R=mtklein@google.com

Author: halcanary@google.com

Review URL: https://codereview.chromium.org/138563004

git-svn-id: http://skia.googlecode.com/svn/trunk@13074 2bbb7eff-a529-9590-31e7-b0007b416f81

169 files changed, 54 insertions, 216 deletions

diff --git a/tests/AAClipTest.cpp b/tests/AAClipTest.cpp
index 6c681913eb..cc5c17b628 100644
--- a/tests/AAClipTest.cpp
+++ b/tests/AAClipTest.cpp
@@ -394,7 +394,6 @@ static void test_regressions() {
     }
 }
 
-#include "TestClassDef.h"
 DEF_TEST(AAClip, reporter) {
     test_empty(reporter);
     test_path_bounds(reporter);
diff --git a/tests/ARGBImageEncoderTest.cpp b/tests/ARGBImageEncoderTest.cpp
index 8157cc779f..7101165547 100644
--- a/tests/ARGBImageEncoderTest.cpp
+++ b/tests/ARGBImageEncoderTest.cpp
@@ -11,7 +11,6 @@
 #include "SkCanvas.h"
 #include "SkStream.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static SkBitmap::Config configs[] = {
     SkBitmap::kRGB_565_Config,
diff --git a/tests/AndroidPaintTest.cpp b/tests/AndroidPaintTest.cpp
index 0f6c1e9a96..0c0f9db93b 100644
--- a/tests/AndroidPaintTest.cpp
+++ b/tests/AndroidPaintTest.cpp
@@ -6,7 +6,6 @@
 #include "SkOrderedWriteBuffer.h"
 #include "SkPaint.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static size_t Reconstruct(const SkPaint& src, SkPaint* dst) {
     SkOrderedWriteBuffer writer;
diff --git a/tests/AnnotationTest.cpp b/tests/AnnotationTest.cpp
index db33afa6ab..6d3720d0fe 100644
--- a/tests/AnnotationTest.cpp
+++ b/tests/AnnotationTest.cpp
@@ -6,7 +6,6 @@
  * found in the LICENSE file.
  */
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkAnnotation.h"
 #include "SkData.h"
 #include "SkCanvas.h"
diff --git a/tests/AtomicTest.cpp b/tests/AtomicTest.cpp
index b7b13b3fab..9d5f0e6e14 100644
--- a/tests/AtomicTest.cpp
+++ b/tests/AtomicTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkThread.h"
 #include "SkThreadUtils.h"
 #include "SkTypes.h"
diff --git a/tests/BitSetTest.cpp b/tests/BitSetTest.cpp
index bdfe9978e6..f1ebb364b3 100644
--- a/tests/BitSetTest.cpp
+++ b/tests/BitSetTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkBitSet.h"
 
 DEF_TEST(BitSet, reporter) {
diff --git a/tests/BitmapCopyTest.cpp b/tests/BitmapCopyTest.cpp
index d831e5e120..7f78392cea 100644
--- a/tests/BitmapCopyTest.cpp
+++ b/tests/BitmapCopyTest.cpp
@@ -6,7 +6,6 @@
  * found in the LICENSE file.
  */
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkBitmap.h"
 #include "SkRect.h"
 
diff --git a/tests/BitmapGetColorTest.cpp b/tests/BitmapGetColorTest.cpp
index 7fc584fc29..79dddbbc3b 100644
--- a/tests/BitmapGetColorTest.cpp
+++ b/tests/BitmapGetColorTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkBitmap.h"
 #include "SkRect.h"
 #include "SkRandom.h"
diff --git a/tests/BitmapHasherTest.cpp b/tests/BitmapHasherTest.cpp
index fe7abdeb60..2c1f4a39df 100644
--- a/tests/BitmapHasherTest.cpp
+++ b/tests/BitmapHasherTest.cpp
@@ -10,7 +10,6 @@
 #include "SkBitmap.h"
 #include "SkColor.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 // Word size that is large enough to hold results of any checksum type.
 typedef uint64_t checksum_result;
diff --git a/tests/BitmapHeapTest.cpp b/tests/BitmapHeapTest.cpp
index bcfec22fd1..80591054db 100644
--- a/tests/BitmapHeapTest.cpp
+++ b/tests/BitmapHeapTest.cpp
@@ -14,7 +14,6 @@
 #include "SkRefCnt.h"
 #include "SkShader.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 struct SkShaderTraits {
     static void flatten(SkOrderedWriteBuffer& buffer, const SkShader& shader) {
diff --git a/tests/BitmapTest.cpp b/tests/BitmapTest.cpp
index ef637f4738..e304076a34 100644
--- a/tests/BitmapTest.cpp
+++ b/tests/BitmapTest.cpp
@@ -8,7 +8,6 @@
 #include "SkBitmap.h"
 
 #include "Test.h"
-#include "TestClassDef.h"
 
 static void test_bigwidth(skiatest::Reporter* reporter) {
     SkBitmap bm;
diff --git a/tests/BlitRowTest.cpp b/tests/BlitRowTest.cpp
index 1b0fad0105..3f3f529462 100644
--- a/tests/BlitRowTest.cpp
+++ b/tests/BlitRowTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
diff --git a/tests/BlurTest.cpp b/tests/BlurTest.cpp
index cfcc10362b..386581c74c 100644
--- a/tests/BlurTest.cpp
+++ b/tests/BlurTest.cpp
@@ -11,7 +11,6 @@
 #include "SkMath.h"
 #include "SkPaint.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContextFactory.h"
diff --git a/tests/CachedDecodingPixelRefTest.cpp b/tests/CachedDecodingPixelRefTest.cpp
index 434724d0cf..8a329d8838 100644
--- a/tests/CachedDecodingPixelRefTest.cpp
+++ b/tests/CachedDecodingPixelRefTest.cpp
@@ -17,7 +17,6 @@
 #include "SkUtils.h"
 
 #include "Test.h"
-#include "TestClassDef.h"
 
 /**
  * Fill this bitmap with some color.
diff --git a/tests/CanvasStateTest.cpp b/tests/CanvasStateTest.cpp
index 854300907a..4d39d9e279 100644
--- a/tests/CanvasStateTest.cpp
+++ b/tests/CanvasStateTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkCanvasStateUtils.h"
diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp
index 744eafcf80..4ff842b901 100644
--- a/tests/CanvasTest.cpp
+++ b/tests/CanvasTest.cpp
@@ -63,7 +63,6 @@
 #include "SkStream.h"
 #include "SkTDArray.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 class Canvas2CanvasClipVisitor : public SkCanvas::ClipVisitor {
 public:
diff --git a/tests/ChecksumTest.cpp b/tests/ChecksumTest.cpp
index 478f8435f9..6248678043 100644
--- a/tests/ChecksumTest.cpp
+++ b/tests/ChecksumTest.cpp
@@ -8,7 +8,6 @@
 #include "SkChecksum.h"
 #include "SkRandom.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 
 // Murmur3 has an optional third seed argument, so we wrap it to fit a uniform type.
diff --git a/tests/ClampRangeTest.cpp b/tests/ClampRangeTest.cpp
index a9a59acb6a..16ca525a88 100644
--- a/tests/ClampRangeTest.cpp
+++ b/tests/ClampRangeTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "gradients/SkClampRange.h"
 #include "SkRandom.h"
 
diff --git a/tests/ClipCacheTest.cpp b/tests/ClipCacheTest.cpp
index 84564c4489..15a1332b85 100644
--- a/tests/ClipCacheTest.cpp
+++ b/tests/ClipCacheTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 // This is a GR test
 #if SK_SUPPORT_GPU
 #include "GrContextFactory.h"
diff --git a/tests/ClipCubicTest.cpp b/tests/ClipCubicTest.cpp
index 829b7b6e0e..05ced3df88 100644
--- a/tests/ClipCubicTest.cpp
+++ b/tests/ClipCubicTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkCubicClipper.h"
diff --git a/tests/ClipStackTest.cpp b/tests/ClipStackTest.cpp
index 05f9fcaaa3..11504315c8 100644
--- a/tests/ClipStackTest.cpp
+++ b/tests/ClipStackTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #if SK_SUPPORT_GPU
     #include "GrReducedClip.h"
 #endif
diff --git a/tests/ClipperTest.cpp b/tests/ClipperTest.cpp
index 6f2e0af4f2..6f72068a63 100644
--- a/tests/ClipperTest.cpp
+++ b/tests/ClipperTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkCanvas.h"
 #include "SkEdgeClipper.h"
 #include "SkLineClipper.h"
diff --git a/tests/ColorFilterTest.cpp b/tests/ColorFilterTest.cpp
index 7ad19b7aff..4d2f815439 100644
--- a/tests/ColorFilterTest.cpp
+++ b/tests/ColorFilterTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkColor.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
diff --git a/tests/ColorPrivTest.cpp b/tests/ColorPrivTest.cpp
index 19a63c7843..02885d0982 100644
--- a/tests/ColorPrivTest.cpp
+++ b/tests/ColorPrivTest.cpp
@@ -1,5 +1,4 @@
 #include "Test.h"
-#include "TestClassDef.h"
 
 #include "SkColorPriv.h"
 
diff --git a/tests/ColorTest.cpp b/tests/ColorTest.cpp
index 6b1d7d7028..64f2785035 100644
--- a/tests/ColorTest.cpp
+++ b/tests/ColorTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkColor.h"
 #include "SkColorPriv.h"
 #include "SkMathPriv.h"
diff --git a/tests/DataRefTest.cpp b/tests/DataRefTest.cpp
index 6a513923ff..e4c0a6b39a 100644
--- a/tests/DataRefTest.cpp
+++ b/tests/DataRefTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkData.h"
 #include "SkDataTable.h"
 #include "SkOrderedReadBuffer.h"
diff --git a/tests/DeferredCanvasTest.cpp b/tests/DeferredCanvasTest.cpp
index 132736e5f7..df7c658f19 100644
--- a/tests/DeferredCanvasTest.cpp
+++ b/tests/DeferredCanvasTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkBitmap.h"
 #include "SkBitmapDevice.h"
 #include "SkBitmapProcShader.h"
diff --git a/tests/DequeTest.cpp b/tests/DequeTest.cpp
index d3e1c175fe..8a836d39c3 100644
--- a/tests/DequeTest.cpp
+++ b/tests/DequeTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkDeque.h"
 
 static void assert_count(skiatest::Reporter* reporter, const SkDeque& deq, int count) {
diff --git a/tests/DeviceLooperTest.cpp b/tests/DeviceLooperTest.cpp
index 2dc94107c3..bd1aa09d05 100644
--- a/tests/DeviceLooperTest.cpp
+++ b/tests/DeviceLooperTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkDeviceLooper.h"
 #include "SkRasterClip.h"
 
diff --git a/tests/DiscardableMemoryPool.cpp b/tests/DiscardableMemoryPool.cpp
index d2c5eeef46..dc927bd4b7 100644
--- a/tests/DiscardableMemoryPool.cpp
+++ b/tests/DiscardableMemoryPool.cpp
@@ -7,7 +7,6 @@
 #include "SkDiscardableMemoryPool.h"
 
 #include "Test.h"
-#include "TestClassDef.h"
 
 DEF_TEST(DiscardableMemoryPool, reporter) {
     SkAutoTUnref<SkDiscardableMemoryPool> pool(
diff --git a/tests/DiscardableMemoryTest.cpp b/tests/DiscardableMemoryTest.cpp
index 637dedec58..da36ffd8b0 100644
--- a/tests/DiscardableMemoryTest.cpp
+++ b/tests/DiscardableMemoryTest.cpp
@@ -8,7 +8,6 @@
 #include "SkDiscardableMemory.h"
 
 #include "Test.h"
-#include "TestClassDef.h"
 
 DEF_TEST(DiscardableMemory, reporter) {
     const char testString[] = "HELLO, WORLD!";
diff --git a/tests/DocumentTest.cpp b/tests/DocumentTest.cpp
index a717ac7de3..73510f8432 100644
--- a/tests/DocumentTest.cpp
+++ b/tests/DocumentTest.cpp
@@ -1,5 +1,4 @@
 #include "Test.h"
-#include "TestClassDef.h"
 
 #include "SkCanvas.h"
 #include "SkDocument.h"
diff --git a/tests/DrawBitmapRectTest.cpp b/tests/DrawBitmapRectTest.cpp
index c8718489c4..a6ab817c44 100644
--- a/tests/DrawBitmapRectTest.cpp
+++ b/tests/DrawBitmapRectTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkData.h"
diff --git a/tests/DrawPathTest.cpp b/tests/DrawPathTest.cpp
index 8c77ffe031..ac015b6191 100644
--- a/tests/DrawPathTest.cpp
+++ b/tests/DrawPathTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkDashPathEffect.h"
diff --git a/tests/DrawTextTest.cpp b/tests/DrawTextTest.cpp
index 768c93603d..93f4b61e4e 100644
--- a/tests/DrawTextTest.cpp
+++ b/tests/DrawTextTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
diff --git a/tests/DynamicHashTest.cpp b/tests/DynamicHashTest.cpp
index d881738219..4202270beb 100644
--- a/tests/DynamicHashTest.cpp
+++ b/tests/DynamicHashTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkTDynamicHash.h"
 
 namespace {
diff --git a/tests/EmptyPathTest.cpp b/tests/EmptyPathTest.cpp
index 39e36808c7..d0d31bf7a3 100644
--- a/tests/EmptyPathTest.cpp
+++ b/tests/EmptyPathTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkPath.h"
 #include "SkCanvas.h"
 
diff --git a/tests/ErrorTest.cpp b/tests/ErrorTest.cpp
index 9dca9d87d5..352520574f 100644
--- a/tests/ErrorTest.cpp
+++ b/tests/ErrorTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkError.h"
 #include "SkPath.h"
 #include "SkRect.h"
diff --git a/tests/FillPathTest.cpp b/tests/FillPathTest.cpp
index ef0f5bfe32..20b47cafb2 100644
--- a/tests/FillPathTest.cpp
+++ b/tests/FillPathTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkRegion.h"
 #include "SkPath.h"
 #include "SkScan.h"
diff --git a/tests/FitsInTest.cpp b/tests/FitsInTest.cpp
index b66d53b519..4db81dd3e3 100644
--- a/tests/FitsInTest.cpp
+++ b/tests/FitsInTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkTypes.h"
 #include "SkTFitsIn.h"
 
diff --git a/tests/FlatDataTest.cpp b/tests/FlatDataTest.cpp
index 95a2bd020f..54427f4116 100644
--- a/tests/FlatDataTest.cpp
+++ b/tests/FlatDataTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
diff --git a/tests/FlateTest.cpp b/tests/FlateTest.cpp
index 8d5f015979..22c70ab886 100644
--- a/tests/FlateTest.cpp
+++ b/tests/FlateTest.cpp
@@ -9,7 +9,6 @@
 #include <string.h>
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkData.h"
 #include "SkFlate.h"
 #include "SkStream.h"
diff --git a/tests/FontHostStreamTest.cpp b/tests/FontHostStreamTest.cpp
index b9f39b3110..3f50a921ce 100644
--- a/tests/FontHostStreamTest.cpp
+++ b/tests/FontHostStreamTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
diff --git a/tests/FontHostTest.cpp b/tests/FontHostTest.cpp
index ba3a582fcb..f9e23c80d6 100644
--- a/tests/FontHostTest.cpp
+++ b/tests/FontHostTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkPaint.h"
 #include "SkFontStream.h"
 #include "SkOSFile.h"
diff --git a/tests/FontMgrTest.cpp b/tests/FontMgrTest.cpp
index 8ecdecc43f..32c61db495 100644
--- a/tests/FontMgrTest.cpp
+++ b/tests/FontMgrTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkCommandLineFlags.h"
 #include "SkFontMgr.h"
 #include "SkTypeface.h"
diff --git a/tests/FontNamesTest.cpp b/tests/FontNamesTest.cpp
index adbf81347d..ddae1388ce 100644
--- a/tests/FontNamesTest.cpp
+++ b/tests/FontNamesTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkCommandLineFlags.h"
 #include "SkFontMgr.h"
 #include "SkOTTable_name.h"
diff --git a/tests/FrontBufferedStreamTest.cpp b/tests/FrontBufferedStreamTest.cpp
index 3693fa5536..d2290f22ed 100644
--- a/tests/FrontBufferedStreamTest.cpp
+++ b/tests/FrontBufferedStreamTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkFrontBufferedStream.h"
 #include "SkRefCnt.h"
 #include "SkStream.h"
diff --git a/tests/GLInterfaceValidation.cpp b/tests/GLInterfaceValidation.cpp
index 792ed039fb..d47a66da0f 100755
--- a/tests/GLInterfaceValidation.cpp
+++ b/tests/GLInterfaceValidation.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 
 // This is a GPU-backend specific test
 #if SK_SUPPORT_GPU
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index 10d56fe127..236a9b37fd 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -21,7 +21,6 @@
 #include "SkChecksum.h"
 #include "SkRandom.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 void GrGLProgramDesc::setRandom(SkRandom* random,
                                 const GrGpuGL* gpu,
diff --git a/tests/GeometryTest.cpp b/tests/GeometryTest.cpp
index b090c89ec0..01ac4d7a72 100644
--- a/tests/GeometryTest.cpp
+++ b/tests/GeometryTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkGeometry.h"
 
 static bool nearly_equal(const SkPoint& a, const SkPoint& b) {
diff --git a/tests/GifTest.cpp b/tests/GifTest.cpp
index c9dac9b497..c2b8a88032 100644
--- a/tests/GifTest.cpp
+++ b/tests/GifTest.cpp
@@ -12,7 +12,6 @@
     (!defined(SK_BUILD_FOR_MAC))
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkBitmap.h"
 #include "SkData.h"
 #include "SkForceLinking.h"
diff --git a/tests/GpuBitmapCopyTest.cpp b/tests/GpuBitmapCopyTest.cpp
index 9d1a527be0..681ea6995b 100644
--- a/tests/GpuBitmapCopyTest.cpp
+++ b/tests/GpuBitmapCopyTest.cpp
@@ -18,7 +18,6 @@
 #include "SkPixelRef.h"
 #include "SkRect.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static const char* boolStr(bool value) {
     return value ? "true" : "false";
diff --git a/tests/GpuColorFilterTest.cpp b/tests/GpuColorFilterTest.cpp
index 0d8acc5d01..9ba9431939 100644
--- a/tests/GpuColorFilterTest.cpp
+++ b/tests/GpuColorFilterTest.cpp
@@ -14,7 +14,6 @@
 #include "SkColorFilter.h"
 #include "SkGr.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static GrColor filterColor(const GrColor& color, uint32_t flags)  {
     uint32_t mask = 0;
diff --git a/tests/GpuDrawPathTest.cpp b/tests/GpuDrawPathTest.cpp
index f2a321f756..eb83db378c 100644
--- a/tests/GpuDrawPathTest.cpp
+++ b/tests/GpuDrawPathTest.cpp
@@ -17,7 +17,6 @@
 #include "SkRect.h"
 #include "SkRRect.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static void test_drawPathEmpty(skiatest::Reporter*, SkCanvas* canvas) {
     // Filling an empty path should not crash.
diff --git a/tests/GrContextFactoryTest.cpp b/tests/GrContextFactoryTest.cpp
index 9ffbd64f9b..461a57a6d6 100644
--- a/tests/GrContextFactoryTest.cpp
+++ b/tests/GrContextFactoryTest.cpp
@@ -9,7 +9,6 @@
 
 #include "GrContextFactory.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 DEF_GPUTEST(GrContextFactoryTest, reporter, factory) {
     // Reset in case some other test has been using it first.
diff --git a/tests/GrDrawTargetTest.cpp b/tests/GrDrawTargetTest.cpp
index 78d9025a2d..68f922fbb1 100644
--- a/tests/GrDrawTargetTest.cpp
+++ b/tests/GrDrawTargetTest.cpp
@@ -13,7 +13,6 @@
 #include "GrGpu.h"
 #include "GrDrawTargetCaps.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static void test_print(skiatest::Reporter*, const GrDrawTargetCaps* caps) {
     // This used to assert.
diff --git a/tests/GrMemoryPoolTest.cpp b/tests/GrMemoryPoolTest.cpp
index 9d974ab2f5..faf5ca179e 100644
--- a/tests/GrMemoryPoolTest.cpp
+++ b/tests/GrMemoryPoolTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 // This is a GPU-backend specific test
 #if SK_SUPPORT_GPU
 #include "GrMemoryPool.h"
diff --git a/tests/GrSurfaceTest.cpp b/tests/GrSurfaceTest.cpp
index 07bf0ce913..b73adc0b1e 100644
--- a/tests/GrSurfaceTest.cpp
+++ b/tests/GrSurfaceTest.cpp
@@ -13,7 +13,6 @@
 #include "GrTexture.h"
 #include "SkTypes.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 DEF_GPUTEST(GrSurfaceTest, reporter, factory) {
     GrContext* context = factory->get(GrContextFactory::kNull_GLContextType);
diff --git a/tests/GrUnitTests.cpp b/tests/GrUnitTests.cpp
index d444afc178..ddb5ead6c0 100644
--- a/tests/GrUnitTests.cpp
+++ b/tests/GrUnitTests.cpp
@@ -6,7 +6,6 @@
  * found in the LICENSE file.
  */
 #include "Test.h"
-#include "TestClassDef.h"
 
 // This is a GPU-backend specific test
 #if SK_SUPPORT_GPU
diff --git a/tests/GradientTest.cpp b/tests/GradientTest.cpp
index 1f77fbb0b0..da9ac7f808 100644
--- a/tests/GradientTest.cpp
+++ b/tests/GradientTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkBitmapDevice.h"
 #include "SkColorShader.h"
 #include "SkEmptyShader.h"
diff --git a/tests/HashCacheTest.cpp b/tests/HashCacheTest.cpp
index 437a80c6b7..93877cb13c 100644
--- a/tests/HashCacheTest.cpp
+++ b/tests/HashCacheTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 
 // This is a GR test
 #if SK_SUPPORT_GPU
diff --git a/tests/ImageCacheTest.cpp b/tests/ImageCacheTest.cpp
index a7946f49ca..06e5ab86ed 100644
--- a/tests/ImageCacheTest.cpp
+++ b/tests/ImageCacheTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkDiscardableMemory.h"
 #include "SkScaledImageCache.h"
 
diff --git a/tests/ImageDecodingTest.cpp b/tests/ImageDecodingTest.cpp
index becb8c9dd6..b4aaa9c5a2 100644
--- a/tests/ImageDecodingTest.cpp
+++ b/tests/ImageDecodingTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp
index 44b917c205..3f984c4705 100644
--- a/tests/ImageFilterTest.cpp
+++ b/tests/ImageFilterTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkBicubicImageFilter.h"
 #include "SkBitmap.h"
 #include "SkBitmapDevice.h"
diff --git a/tests/InfRectTest.cpp b/tests/InfRectTest.cpp
index 674cf5b802..9202ff9dbf 100644
--- a/tests/InfRectTest.cpp
+++ b/tests/InfRectTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkRandom.h"
 #include "SkRect.h"
 
diff --git a/tests/JpegTest.cpp b/tests/JpegTest.cpp
index 4d00eece2a..36a7a11d73 100644
--- a/tests/JpegTest.cpp
+++ b/tests/JpegTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkBitmap.h"
 #include "SkData.h"
 #include "SkForceLinking.h"
diff --git a/tests/LListTest.cpp b/tests/LListTest.cpp
index dc7b37741b..4c6ff59ee6 100644
--- a/tests/LListTest.cpp
+++ b/tests/LListTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkRandom.h"
 #include "SkTInternalLList.h"
 #include "SkTLList.h"
diff --git a/tests/LayerDrawLooperTest.cpp b/tests/LayerDrawLooperTest.cpp
index 01ebca1464..d6ff92e80c 100644
--- a/tests/LayerDrawLooperTest.cpp
+++ b/tests/LayerDrawLooperTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkBitmap.h"
 #include "SkBitmapDevice.h"
 #include "SkCanvas.h"
diff --git a/tests/MD5Test.cpp b/tests/MD5Test.cpp
index ed9f69cd8d..ae827f7a6b 100644
--- a/tests/MD5Test.cpp
+++ b/tests/MD5Test.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkMD5.h"
 
 static bool digests_equal(const SkMD5::Digest& expectedDigest, const SkMD5::Digest& computedDigest) {
diff --git a/tests/MallocPixelRefTest.cpp b/tests/MallocPixelRefTest.cpp
index e169763dad..bf8f16df5f 100644
--- a/tests/MallocPixelRefTest.cpp
+++ b/tests/MallocPixelRefTest.cpp
@@ -8,7 +8,6 @@
 #include "SkData.h"
 #include "SkMallocPixelRef.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static void delete_uint8_proc(void* ptr, void*) {
     delete[] static_cast<uint8_t*>(ptr);
diff --git a/tests/MathTest.cpp b/tests/MathTest.cpp
index 58dd0c6399..1d73d582c9 100644
--- a/tests/MathTest.cpp
+++ b/tests/MathTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkColorPriv.h"
 #include "SkEndian.h"
 #include "SkFloatBits.h"
diff --git a/tests/Matrix44Test.cpp b/tests/Matrix44Test.cpp
index 8fd84d858c..e22c9d4b8f 100644
--- a/tests/Matrix44Test.cpp
+++ b/tests/Matrix44Test.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkMatrix44.h"
 
 static bool nearly_equal_double(double a, double b) {
diff --git a/tests/MatrixTest.cpp b/tests/MatrixTest.cpp
index d0fff54c95..26bb122194 100644
--- a/tests/MatrixTest.cpp
+++ b/tests/MatrixTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkMath.h"
 #include "SkMatrix.h"
 #include "SkMatrixUtils.h"
diff --git a/tests/MemoryTest.cpp b/tests/MemoryTest.cpp
index 4c3216b83b..c7eff30a56 100644
--- a/tests/MemoryTest.cpp
+++ b/tests/MemoryTest.cpp
@@ -1,5 +1,4 @@
 #include "Test.h"
-#include "TestClassDef.h"
 
 DEF_TEST(memory_calloc, reporter) {
     const size_t kNum = 200;
diff --git a/tests/MemsetTest.cpp b/tests/MemsetTest.cpp
index 36d0f0a467..73d50ee4b2 100644
--- a/tests/MemsetTest.cpp
+++ b/tests/MemsetTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkChunkAlloc.h"
 #include "SkUtils.h"
 
diff --git a/tests/MessageBusTest.cpp b/tests/MessageBusTest.cpp
index 0e718cbebd..0e40d12311 100644
--- a/tests/MessageBusTest.cpp
+++ b/tests/MessageBusTest.cpp
@@ -7,7 +7,6 @@
 
 #include "SkMessageBus.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 namespace {
 
diff --git a/tests/MetaDataTest.cpp b/tests/MetaDataTest.cpp
index 4512045d23..5f9f340821 100644
--- a/tests/MetaDataTest.cpp
+++ b/tests/MetaDataTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkMetaData.h"
 
 static void test_ptrs(skiatest::Reporter* reporter) {
diff --git a/tests/MipMapTest.cpp b/tests/MipMapTest.cpp
index ed62219af1..1c2771bc9c 100644
--- a/tests/MipMapTest.cpp
+++ b/tests/MipMapTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkMipMap.h"
 #include "SkBitmap.h"
 #include "SkRandom.h"
diff --git a/tests/OSPathTest.cpp b/tests/OSPathTest.cpp
index e0d7b9d410..c082462ff9 100644
--- a/tests/OSPathTest.cpp
+++ b/tests/OSPathTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkString.h"
 #include "SkOSFile.h"
 
diff --git a/tests/OnceTest.cpp b/tests/OnceTest.cpp
index d3a0a0066a..f9ab427c16 100644
--- a/tests/OnceTest.cpp
+++ b/tests/OnceTest.cpp
@@ -8,7 +8,6 @@
 #include "SkOnce.h"
 #include "SkThreadPool.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static void add_five(int* x) {
     *x += 5;
diff --git a/tests/PDFPrimitivesTest.cpp b/tests/PDFPrimitivesTest.cpp
index 5f0750d77a..15093657e1 100644
--- a/tests/PDFPrimitivesTest.cpp
+++ b/tests/PDFPrimitivesTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkData.h"
diff --git a/tests/PackBitsTest.cpp b/tests/PackBitsTest.cpp
index 8a6ed88f67..017e341f66 100644
--- a/tests/PackBitsTest.cpp
+++ b/tests/PackBitsTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkPackBits.h"
 
 static const uint16_t gTest0[] = { 0, 0, 1, 1 };
diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp
index eed9de3a5c..2a6bad4542 100644
--- a/tests/PaintTest.cpp
+++ b/tests/PaintTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
 #include "SkLayerDrawLooper.h"
diff --git a/tests/ParsePathTest.cpp b/tests/ParsePathTest.cpp
index 3ade1a765b..23b8919e3c 100644
--- a/tests/ParsePathTest.cpp
+++ b/tests/ParsePathTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkParsePath.h"
 
 static void test_to_from(skiatest::Reporter* reporter, const SkPath& path) {
diff --git a/tests/PathCoverageTest.cpp b/tests/PathCoverageTest.cpp
index c133e9cccc..cc0db7cb27 100644
--- a/tests/PathCoverageTest.cpp
+++ b/tests/PathCoverageTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkMath.h"
 #include "SkPoint.h"
 #include "SkScalar.h"
diff --git a/tests/PathMeasureTest.cpp b/tests/PathMeasureTest.cpp
index 2d7b64ec36..00a3e2ef48 100644
--- a/tests/PathMeasureTest.cpp
+++ b/tests/PathMeasureTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkPathMeasure.h"
 
 static void test_small_segment3() {
diff --git a/tests/PathOpsAngleTest.cpp b/tests/PathOpsAngleTest.cpp
index f326a90cc4..7e32f1329b 100644
--- a/tests/PathOpsAngleTest.cpp
+++ b/tests/PathOpsAngleTest.cpp
@@ -8,7 +8,6 @@
 #include "SkOpSegment.h"
 #include "SkTArray.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static const SkPoint cubics[][4] = {
 /* 0 */    {{0, 1}, {2, 6}, {4, 2}, {5, 3}},
diff --git a/tests/PathOpsBoundsTest.cpp b/tests/PathOpsBoundsTest.cpp
index 0e813d2a8e..8683051b05 100644
--- a/tests/PathOpsBoundsTest.cpp
+++ b/tests/PathOpsBoundsTest.cpp
@@ -7,7 +7,6 @@
 #include "PathOpsTestCommon.h"
 #include "SkPathOpsBounds.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static const SkRect sectTests[][2] = {
     {{2, 0, 4, 1}, {4, 0, 6, 1}},
diff --git a/tests/PathOpsCubicIntersectionTest.cpp b/tests/PathOpsCubicIntersectionTest.cpp
index 974d426e6a..9c82c27c91 100644
--- a/tests/PathOpsCubicIntersectionTest.cpp
+++ b/tests/PathOpsCubicIntersectionTest.cpp
@@ -10,7 +10,6 @@
 #include "SkPathOpsRect.h"
 #include "SkReduceOrder.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 const int firstCubicIntersectionTest = 9;
 
diff --git a/tests/PathOpsCubicLineIntersectionTest.cpp b/tests/PathOpsCubicLineIntersectionTest.cpp
index a021454cb6..3f9e9ff1c7 100644
--- a/tests/PathOpsCubicLineIntersectionTest.cpp
+++ b/tests/PathOpsCubicLineIntersectionTest.cpp
@@ -10,7 +10,6 @@
 #include "SkPathOpsLine.h"
 #include "SkReduceOrder.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static struct lineCubic {
     SkDCubic cubic;
diff --git a/tests/PathOpsCubicQuadIntersectionTest.cpp b/tests/PathOpsCubicQuadIntersectionTest.cpp
index 7fca3c3e7e..0144bade22 100644
--- a/tests/PathOpsCubicQuadIntersectionTest.cpp
+++ b/tests/PathOpsCubicQuadIntersectionTest.cpp
@@ -10,7 +10,6 @@
 #include "SkPathOpsQuad.h"
 #include "SkReduceOrder.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static struct lineCubic {
     SkDCubic cubic;
diff --git a/tests/PathOpsCubicReduceOrderTest.cpp b/tests/PathOpsCubicReduceOrderTest.cpp
index 090e22ef86..dc779b86f5 100644
--- a/tests/PathOpsCubicReduceOrderTest.cpp
+++ b/tests/PathOpsCubicReduceOrderTest.cpp
@@ -11,7 +11,6 @@
 #include "SkPathOpsRect.h"
 #include "SkReduceOrder.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 #if 0 // disable test until stroke reduction is supported
 static bool controls_inside(const SkDCubic& cubic) {
diff --git a/tests/PathOpsCubicToQuadsTest.cpp b/tests/PathOpsCubicToQuadsTest.cpp
index 4c0f414ad7..ab22a83ca8 100644
--- a/tests/PathOpsCubicToQuadsTest.cpp
+++ b/tests/PathOpsCubicToQuadsTest.cpp
@@ -12,7 +12,6 @@
 #include "SkPathOpsRect.h"
 #include "SkReduceOrder.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static void test(skiatest::Reporter* reporter, const SkDCubic* cubics, const char* name,
                  int firstTest, size_t testCount) {
diff --git a/tests/PathOpsDCubicTest.cpp b/tests/PathOpsDCubicTest.cpp
index 279564b7c5..422236de46 100644
--- a/tests/PathOpsDCubicTest.cpp
+++ b/tests/PathOpsDCubicTest.cpp
@@ -7,7 +7,6 @@
 #include "PathOpsTestCommon.h"
 #include "SkPathOpsCubic.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static const SkDCubic tests[] = {
     {{{2, 0}, {3, 1}, {2, 2}, {1, 1}}},
diff --git a/tests/PathOpsDLineTest.cpp b/tests/PathOpsDLineTest.cpp
index c7edb29f7d..dd86dd39e3 100644
--- a/tests/PathOpsDLineTest.cpp
+++ b/tests/PathOpsDLineTest.cpp
@@ -7,7 +7,6 @@
 #include "PathOpsTestCommon.h"
 #include "SkPathOpsLine.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static const SkDLine tests[] = {
     {{{2, 1}, {2, 1}}},
diff --git a/tests/PathOpsDPointTest.cpp b/tests/PathOpsDPointTest.cpp
index 507a32029a..186d691d10 100644
--- a/tests/PathOpsDPointTest.cpp
+++ b/tests/PathOpsDPointTest.cpp
@@ -7,7 +7,6 @@
 #include "PathOpsTestCommon.h"
 #include "SkPathOpsPoint.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static const SkDPoint tests[] = {
     {0, 0},
diff --git a/tests/PathOpsDQuadTest.cpp b/tests/PathOpsDQuadTest.cpp
index 80d81e8129..bd29ff11ba 100644
--- a/tests/PathOpsDQuadTest.cpp
+++ b/tests/PathOpsDQuadTest.cpp
@@ -9,7 +9,6 @@
 #include "SkPathOpsQuad.h"
 #include "SkRRect.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static const SkDQuad tests[] = {
     {{{1, 1}, {2, 1}, {0, 2}}},
diff --git a/tests/PathOpsDRectTest.cpp b/tests/PathOpsDRectTest.cpp
index 21c5f2a34c..874e82b69a 100644
--- a/tests/PathOpsDRectTest.cpp
+++ b/tests/PathOpsDRectTest.cpp
@@ -10,7 +10,6 @@
 #include "SkPathOpsQuad.h"
 #include "SkPathOpsRect.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static const SkDLine lineTests[] = {
     {{{2, 1}, {2, 1}}},
diff --git a/tests/PathOpsDTriangleTest.cpp b/tests/PathOpsDTriangleTest.cpp
index 1a06287c2f..b5e2d414a7 100644
--- a/tests/PathOpsDTriangleTest.cpp
+++ b/tests/PathOpsDTriangleTest.cpp
@@ -7,7 +7,6 @@
 #include "PathOpsTestCommon.h"
 #include "SkPathOpsTriangle.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static const SkDTriangle tests[] = {
     {{{2, 0}, {3, 1}, {2, 2}}},
diff --git a/tests/PathOpsDVectorTest.cpp b/tests/PathOpsDVectorTest.cpp
index 4d350373f9..ab291b2477 100644
--- a/tests/PathOpsDVectorTest.cpp
+++ b/tests/PathOpsDVectorTest.cpp
@@ -7,7 +7,6 @@
 #include "PathOpsTestCommon.h"
 #include "SkPathOpsPoint.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static const SkDPoint tests[] = {
     {0, 0},
diff --git a/tests/PathOpsInverseTest.cpp b/tests/PathOpsInverseTest.cpp
index adbb80da98..424922a1d6 100644
--- a/tests/PathOpsInverseTest.cpp
+++ b/tests/PathOpsInverseTest.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 #include "PathOpsExtendedTest.h"
-#include "TestClassDef.h"
 
 DEF_TEST(PathOpsInverse, reporter) {
     SkPath one, two;
diff --git a/tests/PathOpsLineIntersectionTest.cpp b/tests/PathOpsLineIntersectionTest.cpp
index 3633262115..9885178603 100644
--- a/tests/PathOpsLineIntersectionTest.cpp
+++ b/tests/PathOpsLineIntersectionTest.cpp
@@ -8,7 +8,6 @@
 #include "SkIntersections.h"
 #include "SkPathOpsLine.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 // FIXME: add tests for intersecting, non-intersecting, degenerate, coincident
 static const SkDLine tests[][2] = {
diff --git a/tests/PathOpsLineParametetersTest.cpp b/tests/PathOpsLineParametetersTest.cpp
index e67b0f726e..aab1f7a961 100644
--- a/tests/PathOpsLineParametetersTest.cpp
+++ b/tests/PathOpsLineParametetersTest.cpp
@@ -7,7 +7,6 @@
 #include "PathOpsTestCommon.h"
 #include "SkLineParameters.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 // tests to verify that distance calculations are coded correctly
 static const SkDCubic tests[] = {
diff --git a/tests/PathOpsOpCubicThreadedTest.cpp b/tests/PathOpsOpCubicThreadedTest.cpp
index cf10bb5ef1..387f9bd6ce 100644
--- a/tests/PathOpsOpCubicThreadedTest.cpp
+++ b/tests/PathOpsOpCubicThreadedTest.cpp
@@ -6,7 +6,6 @@
  */
 #include "PathOpsExtendedTest.h"
 #include "PathOpsThreadedCommon.h"
-#include "TestClassDef.h"
 
 static void testOpCubicsMain(PathOpsThreadState* data) {
 #if DEBUG_SHOW_TEST_NAME
diff --git a/tests/PathOpsOpRectThreadedTest.cpp b/tests/PathOpsOpRectThreadedTest.cpp
index fee44e51b2..e9732336e8 100644
--- a/tests/PathOpsOpRectThreadedTest.cpp
+++ b/tests/PathOpsOpRectThreadedTest.cpp
@@ -6,7 +6,6 @@
  */
 #include "PathOpsExtendedTest.h"
 #include "PathOpsThreadedCommon.h"
-#include "TestClassDef.h"
 
 // four rects, of four sizes
 // for 3 smaller sizes, tall, wide
diff --git a/tests/PathOpsOpTest.cpp b/tests/PathOpsOpTest.cpp
index 7e30141862..6f21d122a5 100644
--- a/tests/PathOpsOpTest.cpp
+++ b/tests/PathOpsOpTest.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 #include "PathOpsExtendedTest.h"
-#include "TestClassDef.h"
 
 #define TEST(name) { name, #name }
 
diff --git a/tests/PathOpsQuadIntersectionTest.cpp b/tests/PathOpsQuadIntersectionTest.cpp
index fea0426ff5..37e46d3719 100644
--- a/tests/PathOpsQuadIntersectionTest.cpp
+++ b/tests/PathOpsQuadIntersectionTest.cpp
@@ -10,7 +10,6 @@
 #include "SkPathOpsRect.h"
 #include "SkReduceOrder.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static void standardTestCases(skiatest::Reporter* reporter) {
     bool showSkipped = false;
diff --git a/tests/PathOpsQuadLineIntersectionTest.cpp b/tests/PathOpsQuadLineIntersectionTest.cpp
index e4235d1a40..a7894430bc 100644
--- a/tests/PathOpsQuadLineIntersectionTest.cpp
+++ b/tests/PathOpsQuadLineIntersectionTest.cpp
@@ -11,7 +11,6 @@
 #include "SkPathOpsQuad.h"
 #include "SkReduceOrder.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static struct lineQuad {
     SkDQuad quad;
diff --git a/tests/PathOpsQuadLineIntersectionThreadedTest.cpp b/tests/PathOpsQuadLineIntersectionThreadedTest.cpp
index 44654617ca..8069e86c45 100644
--- a/tests/PathOpsQuadLineIntersectionThreadedTest.cpp
+++ b/tests/PathOpsQuadLineIntersectionThreadedTest.cpp
@@ -10,7 +10,6 @@
 #include "SkPathOpsLine.h"
 #include "SkPathOpsQuad.h"
 #include "SkReduceOrder.h"
-#include "TestClassDef.h"
 
 static int doIntersect(SkIntersections& intersections, const SkDQuad& quad, const SkDLine& line,
                        bool& flipped) {
diff --git a/tests/PathOpsQuadParameterizationTest.cpp b/tests/PathOpsQuadParameterizationTest.cpp
index 042730779c..809243c819 100644
--- a/tests/PathOpsQuadParameterizationTest.cpp
+++ b/tests/PathOpsQuadParameterizationTest.cpp
@@ -7,7 +7,6 @@
 #include "SkDQuadImplicit.h"
 #include "SkPathOpsQuad.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static bool point_on_parameterized_curve(const SkDQuad& quad, const SkDPoint& point) {
     SkDQuadImplicit q(quad);
diff --git a/tests/PathOpsQuadReduceOrderTest.cpp b/tests/PathOpsQuadReduceOrderTest.cpp
index 4c3432755f..9a0bdcf308 100644
--- a/tests/PathOpsQuadReduceOrderTest.cpp
+++ b/tests/PathOpsQuadReduceOrderTest.cpp
@@ -9,7 +9,6 @@
 #include "SkPathOpsRect.h"
 #include "SkReduceOrder.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static const SkDQuad testSet[] = {
     {{{1, 1}, {2, 2}, {1, 1.000003}}},
diff --git a/tests/PathOpsSimplifyDegenerateThreadedTest.cpp b/tests/PathOpsSimplifyDegenerateThreadedTest.cpp
index 5e2ad04771..5cd3c35d8a 100755
--- a/tests/PathOpsSimplifyDegenerateThreadedTest.cpp
+++ b/tests/PathOpsSimplifyDegenerateThreadedTest.cpp
@@ -6,7 +6,6 @@
  */
 #include "PathOpsExtendedTest.h"
 #include "PathOpsThreadedCommon.h"
-#include "TestClassDef.h"
 
 static void testSimplifyDegeneratesMain(PathOpsThreadState* data) {
     SkASSERT(data);
diff --git a/tests/PathOpsSimplifyFailTest.cpp b/tests/PathOpsSimplifyFailTest.cpp
index d0f98a11a6..8bcc883570 100644
--- a/tests/PathOpsSimplifyFailTest.cpp
+++ b/tests/PathOpsSimplifyFailTest.cpp
@@ -8,7 +8,6 @@
 #include "SkPath.h"
 #include "SkPoint.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static const SkPoint nonFinitePts[] = {
     { SK_ScalarInfinity, 0 },
diff --git a/tests/PathOpsSimplifyQuadThreadedTest.cpp b/tests/PathOpsSimplifyQuadThreadedTest.cpp
index e33333a9e5..ac92a629fe 100644
--- a/tests/PathOpsSimplifyQuadThreadedTest.cpp
+++ b/tests/PathOpsSimplifyQuadThreadedTest.cpp
@@ -6,7 +6,6 @@
  */
 #include "PathOpsExtendedTest.h"
 #include "PathOpsThreadedCommon.h"
-#include "TestClassDef.h"
 
 static void testSimplifyQuadsMain(PathOpsThreadState* data)
 {
diff --git a/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp b/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp
index f78a9ed911..afa9200389 100755
--- a/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp
+++ b/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp
@@ -6,7 +6,6 @@
  */
 #include "PathOpsExtendedTest.h"
 #include "PathOpsThreadedCommon.h"
-#include "TestClassDef.h"
 
 static void testSimplifyQuadralateralsMain(PathOpsThreadState* data)
 {
diff --git a/tests/PathOpsSimplifyRectThreadedTest.cpp b/tests/PathOpsSimplifyRectThreadedTest.cpp
index 35cca7d933..9e6a5eaf03 100644
--- a/tests/PathOpsSimplifyRectThreadedTest.cpp
+++ b/tests/PathOpsSimplifyRectThreadedTest.cpp
@@ -6,7 +6,6 @@
  */
 #include "PathOpsExtendedTest.h"
 #include "PathOpsThreadedCommon.h"
-#include "TestClassDef.h"
 
 // four rects, of four sizes
 // for 3 smaller sizes, tall, wide
diff --git a/tests/PathOpsSimplifyTest.cpp b/tests/PathOpsSimplifyTest.cpp
index fff52ca3c8..ba92af761b 100644
--- a/tests/PathOpsSimplifyTest.cpp
+++ b/tests/PathOpsSimplifyTest.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 #include "PathOpsExtendedTest.h"
-#include "TestClassDef.h"
 
 #define TEST(name) { name, #name }
 
diff --git a/tests/PathOpsSimplifyTrianglesThreadedTest.cpp b/tests/PathOpsSimplifyTrianglesThreadedTest.cpp
index a8feaaf10b..b5d6508846 100755
--- a/tests/PathOpsSimplifyTrianglesThreadedTest.cpp
+++ b/tests/PathOpsSimplifyTrianglesThreadedTest.cpp
@@ -6,7 +6,6 @@
  */
 #include "PathOpsExtendedTest.h"
 #include "PathOpsThreadedCommon.h"
-#include "TestClassDef.h"
 
 static void testSimplifyTrianglesMain(PathOpsThreadState* data) {
     SkASSERT(data);
diff --git a/tests/PathOpsSkpClipTest.cpp b/tests/PathOpsSkpClipTest.cpp
index bd39151a85..e0f5e18f67 100755
--- a/tests/PathOpsSkpClipTest.cpp
+++ b/tests/PathOpsSkpClipTest.cpp
@@ -18,7 +18,6 @@
 #include "SkThreadPool.h"
 #include "SkTime.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 #ifdef SK_BUILD_FOR_WIN
     #define PATH_SLASH "\\"
diff --git a/tests/PathOpsSkpTest.cpp b/tests/PathOpsSkpTest.cpp
index 86fe6058a1..39eb4cbd60 100755
--- a/tests/PathOpsSkpTest.cpp
+++ b/tests/PathOpsSkpTest.cpp
@@ -6,7 +6,6 @@
  */
 #include "PathOpsExtendedTest.h"
 
-#include "TestClassDef.h"
 
 #define TEST(name) { name, #name }
 
diff --git a/tests/PathOpsTypesTest.cpp b/tests/PathOpsTypesTest.cpp
index a43fe030bb..a3b051e965 100755
--- a/tests/PathOpsTypesTest.cpp
+++ b/tests/PathOpsTypesTest.cpp
@@ -6,7 +6,6 @@
  */
 #include "PathOpsTestCommon.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static const double roughlyTests[][2] = {
     {5.0402503619650929e-005, 4.3178054475078825e-005}
diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp
index 063f05d5ed..44de1aa352 100644
--- a/tests/PathTest.cpp
+++ b/tests/PathTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkPath.h"
diff --git a/tests/PathUtilsTest.cpp b/tests/PathUtilsTest.cpp
index a147487cfc..65b742c84d 100644
--- a/tests/PathUtilsTest.cpp
+++ b/tests/PathUtilsTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkPathUtils.h"
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index 2fe3885e7e..2bdcfb3461 100644
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
diff --git a/tests/PictureUtilsTest.cpp b/tests/PictureUtilsTest.cpp
index 65771c3467..8cf013cf6d 100644
--- a/tests/PictureUtilsTest.cpp
+++ b/tests/PictureUtilsTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "picture_utils.h"
 #include "SkString.h"
 
diff --git a/tests/PipeTest.cpp b/tests/PipeTest.cpp
index e18b3ae192..579f7365c2 100644
--- a/tests/PipeTest.cpp
+++ b/tests/PipeTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SamplePipeControllers.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
diff --git a/tests/PixelRefTest.cpp b/tests/PixelRefTest.cpp
index e0ffd7a601..3c735c6423 100644
--- a/tests/PixelRefTest.cpp
+++ b/tests/PixelRefTest.cpp
@@ -1,5 +1,4 @@
 #include "Test.h"
-#include "TestClassDef.h"
 
 #include "SkPixelRef.h"
 #include "SkMallocPixelRef.h"
diff --git a/tests/PointTest.cpp b/tests/PointTest.cpp
index d4b9128b3e..fed443a02e 100644
--- a/tests/PointTest.cpp
+++ b/tests/PointTest.cpp
@@ -117,7 +117,6 @@ static void test_underflow(skiatest::Reporter* reporter) {
     REPORTER_ASSERT(reporter, pt == copy);  // pt is unchanged
 }
 
-#include "TestClassDef.h"
 DEF_TEST(Point, reporter) {
     test_casts(reporter);
 
diff --git a/tests/PremulAlphaRoundTripTest.cpp b/tests/PremulAlphaRoundTripTest.cpp
index c963e231fb..77f62dcecd 100644
--- a/tests/PremulAlphaRoundTripTest.cpp
+++ b/tests/PremulAlphaRoundTripTest.cpp
@@ -9,7 +9,6 @@
 #include "SkCanvas.h"
 #include "SkConfig8888.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContextFactory.h"
diff --git a/tests/QuickRejectTest.cpp b/tests/QuickRejectTest.cpp
index d9e555d63b..9546924b84 100644
--- a/tests/QuickRejectTest.cpp
+++ b/tests/QuickRejectTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkCanvas.h"
 #include "SkDrawLooper.h"
 
diff --git a/tests/RTreeTest.cpp b/tests/RTreeTest.cpp
index beff03c650..a78e7462f1 100644
--- a/tests/RTreeTest.cpp
+++ b/tests/RTreeTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkRandom.h"
 #include "SkRTree.h"
 #include "SkTSort.h"
diff --git a/tests/RandomTest.cpp b/tests/RandomTest.cpp
index 536e388d4e..4aa39a3fde 100644
--- a/tests/RandomTest.cpp
+++ b/tests/RandomTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkRandom.h"
 #include "SkTSort.h"
 
diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp
index 85846e76e5..32676debae 100644
--- a/tests/ReadPixelsTest.cpp
+++ b/tests/ReadPixelsTest.cpp
@@ -11,7 +11,6 @@
 #include "SkMathPriv.h"
 #include "SkRegion.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 #if SK_SUPPORT_GPU
 #include "SkGpuDevice.h"
diff --git a/tests/ReadWriteAlphaTest.cpp b/tests/ReadWriteAlphaTest.cpp
index 47a5f5a7c1..5df1ab395f 100644
--- a/tests/ReadWriteAlphaTest.cpp
+++ b/tests/ReadWriteAlphaTest.cpp
@@ -11,7 +11,6 @@
 #include "GrContextFactory.h"
 #include "SkGpuDevice.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static const int X_SIZE = 12;
 static const int Y_SIZE = 12;
diff --git a/tests/Reader32Test.cpp b/tests/Reader32Test.cpp
index b7a7c6ddc9..d557f32715 100644
--- a/tests/Reader32Test.cpp
+++ b/tests/Reader32Test.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkReader32.h"
 
 static void assert_eof(skiatest::Reporter* reporter, const SkReader32& reader) {
diff --git a/tests/RefCntTest.cpp b/tests/RefCntTest.cpp
index d844596fe0..19973f759d 100644
--- a/tests/RefCntTest.cpp
+++ b/tests/RefCntTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkRefCnt.h"
 #include "SkTRefArray.h"
 #include "SkThreadUtils.h"
diff --git a/tests/RefDictTest.cpp b/tests/RefDictTest.cpp
index 96492ead4d..b9f4a9aae3 100644
--- a/tests/RefDictTest.cpp
+++ b/tests/RefDictTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkRefDict.h"
 
 class TestRC : public SkRefCnt {
diff --git a/tests/RegionTest.cpp b/tests/RegionTest.cpp
index 4d423db07b..814a7d45d0 100644
--- a/tests/RegionTest.cpp
+++ b/tests/RegionTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkRegion.h"
 #include "SkRandom.h"
 
diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp
index 6707ebf312..845094b3ea 100644
--- a/tests/ResourceCacheTest.cpp
+++ b/tests/ResourceCacheTest.cpp
@@ -10,7 +10,6 @@
 #include "GrContextFactory.h"
 #include "SkGpuDevice.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 static const int gWidth = 640;
 static const int gHeight = 480;
diff --git a/tests/RoundRectTest.cpp b/tests/RoundRectTest.cpp
index 57c93ae900..891b039838 100644
--- a/tests/RoundRectTest.cpp
+++ b/tests/RoundRectTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkMatrix.h"
 #include "SkRRect.h"
 
diff --git a/tests/RuntimeConfigTest.cpp b/tests/RuntimeConfigTest.cpp
index b2e179cfff..d40a4f0dd6 100644
--- a/tests/RuntimeConfigTest.cpp
+++ b/tests/RuntimeConfigTest.cpp
@@ -6,7 +6,6 @@
  */
 #include "SkRTConf.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 SK_CONF_DECLARE(int, c_RTConfTestVariable,
                 "test.utils.rtconf.testVariable", 1,
diff --git a/tests/SHA1Test.cpp b/tests/SHA1Test.cpp
index 87849b2c8a..d189c1ccf2 100644
--- a/tests/SHA1Test.cpp
+++ b/tests/SHA1Test.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkSHA1.h"
 
 static bool digests_equal(const SkSHA1::Digest& expectedDigest, const SkSHA1::Digest& computedDigest) {
diff --git a/tests/ScalarTest.cpp b/tests/ScalarTest.cpp
index eb52b8adf3..08f5d66834 100644
--- a/tests/ScalarTest.cpp
+++ b/tests/ScalarTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkFloatingPoint.h"
 #include "SkMath.h"
 #include "SkPoint.h"
diff --git a/tests/SerializationTest.cpp b/tests/SerializationTest.cpp
index 38e7051d59..ee7875a747 100644
--- a/tests/SerializationTest.cpp
+++ b/tests/SerializationTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkBitmapDevice.h"
 #include "SkBitmapSource.h"
 #include "SkCanvas.h"
diff --git a/tests/ShaderImageFilterTest.cpp b/tests/ShaderImageFilterTest.cpp
index f0a17acef8..bf5b2753ee 100644
--- a/tests/ShaderImageFilterTest.cpp
+++ b/tests/ShaderImageFilterTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkCanvas.h"
 #include "SkShader.h"
 #include "SkRectShaderImageFilter.h"
diff --git a/tests/ShaderOpacityTest.cpp b/tests/ShaderOpacityTest.cpp
index d514516808..3e67306332 100644
--- a/tests/ShaderOpacityTest.cpp
+++ b/tests/ShaderOpacityTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkShader.h"
 #include "SkGradientShader.h"
 #include "SkColorShader.h"
diff --git a/tests/SkpSkGrTest.cpp b/tests/SkpSkGrTest.cpp
index a896517c56..c22b50f1fb 100755
--- a/tests/SkpSkGrTest.cpp
+++ b/tests/SkpSkGrTest.cpp
@@ -26,7 +26,6 @@
 #include "SkThreadPool.h"
 #include "SkTime.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 #ifdef SK_BUILD_FOR_WIN
     #define PATH_SLASH "\\"
diff --git a/tests/SortTest.cpp b/tests/SortTest.cpp
index a114f32f76..198e3cf8da 100644
--- a/tests/SortTest.cpp
+++ b/tests/SortTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkRandom.h"
 #include "SkTSort.h"
 
diff --git a/tests/SrcOverTest.cpp b/tests/SrcOverTest.cpp
index ae01d0c966..91a9c81376 100644
--- a/tests/SrcOverTest.cpp
+++ b/tests/SrcOverTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkColorPriv.h"
 #include "SkXfermode.h"
 
diff --git a/tests/StreamTest.cpp b/tests/StreamTest.cpp
index 6ac06e5c5c..ecb8336596 100644
--- a/tests/StreamTest.cpp
+++ b/tests/StreamTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkRandom.h"
 #include "SkOSFile.h"
 #include "SkStream.h"
diff --git a/tests/StringTest.cpp b/tests/StringTest.cpp
index ceb4df5308..a911a85733 100644
--- a/tests/StringTest.cpp
+++ b/tests/StringTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkString.h"
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/tests/StrokeTest.cpp b/tests/StrokeTest.cpp
index 1278bd4b85..2a28fa4495 100644
--- a/tests/StrokeTest.cpp
+++ b/tests/StrokeTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkPaint.h"
 #include "SkPath.h"
 #include "SkRect.h"
diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index b580999fd5..820d24dfac 100644
--- a/tests/SurfaceTest.cpp
+++ b/tests/SurfaceTest.cpp
@@ -9,7 +9,6 @@
 #include "SkRRect.h"
 #include "SkSurface.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContextFactory.h"
diff --git a/tests/TDStackNesterTest.cpp b/tests/TDStackNesterTest.cpp
index 1dc7e0a9c8..968654b479 100644
--- a/tests/TDStackNesterTest.cpp
+++ b/tests/TDStackNesterTest.cpp
@@ -8,7 +8,6 @@
 #include "SkTDStackNester.h"
 
 #include "Test.h"
-#include "TestClassDef.h"
 
 /**
  *  Test SkTDStackNester<int>::push(). Pushes the current count onto the stack,
diff --git a/tests/TLSTest.cpp b/tests/TLSTest.cpp
index 6a423a586d..1e6b616de4 100644
--- a/tests/TLSTest.cpp
+++ b/tests/TLSTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkGraphics.h"
 #include "SkPaint.h"
 #include "SkTLS.h"
diff --git a/tests/TSetTest.cpp b/tests/TSetTest.cpp
index 4026c6a6f8..dc536332bd 100644
--- a/tests/TSetTest.cpp
+++ b/tests/TSetTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkTSet.h"
 
 // Tests the SkTSet<T> class template.
diff --git a/tests/Test.h b/tests/Test.h
index ff6b4ac82c..2dc7c66f7c 100644
--- a/tests/Test.h
+++ b/tests/Test.h
@@ -87,7 +87,26 @@ namespace skiatest {
     };
 
     typedef SkTRegistry<Test*(*)(void*)> TestRegistry;
-}
+}  // namespace skiatest
+
+/*
+    Use the following macros to make use of the skiatest classes, e.g.
+
+    #include "Test.h"
+
+    DEF_TEST(TestName, reporter) {
+        ...
+        REPORTER_ASSERT(reporter, x == 15);
+        ...
+        REPORTER_ASSERT_MESSAGE(reporter, x == 15, "x should be 15");
+        ...
+        if (x != 15) {
+            ERRORF(reporter, "x should be 15, but is %d", x);
+            return;
+        }
+        ...
+    }
+*/
 
 #define REPORTER_ASSERT(r, cond)                                 \
     do {                                                         \
@@ -116,4 +135,38 @@ namespace skiatest {
         (reporter)->reportFailed(desc);             \
     } while(0)
 
+#define DEF_TEST(name, reporter)                                   \
+    static void name(skiatest::Reporter*);                         \
+    namespace skiatest {                                           \
+    class name##Class : public Test {                              \
+    public:                                                        \
+        static Test* Factory(void*) { return SkNEW(name##Class); } \
+    protected:                                                     \
+        virtual void onGetName(SkString* name) SK_OVERRIDE {       \
+            name->set(#name);                                      \
+        }                                                          \
+        virtual void onRun(Reporter* r) SK_OVERRIDE { name(r); }   \
+    };                                                             \
+    static TestRegistry gReg_##name##Class(name##Class::Factory);  \
+    }                                                              \
+    static void name(skiatest::Reporter* reporter)
+
+#define DEF_GPUTEST(name, reporter, factory)                       \
+    static void name(skiatest::Reporter*, GrContextFactory*);      \
+    namespace skiatest {                                           \
+    class name##Class : public GpuTest {                           \
+    public:                                                        \
+        static Test* Factory(void*) { return SkNEW(name##Class); } \
+    protected:                                                     \
+        virtual void onGetName(SkString* name) SK_OVERRIDE {       \
+            name->set(#name);                                      \
+        }                                                          \
+        virtual void onRun(Reporter* r) SK_OVERRIDE {              \
+            name(r, GetGrContextFactory());                        \
+        }                                                          \
+    };                                                             \
+    static TestRegistry gReg_##name##Class(name##Class::Factory);  \
+    }                                                              \
+    static void name(skiatest::Reporter* reporter, GrContextFactory* factory)
+
 #endif
diff --git a/tests/TestClassDef.h b/tests/TestClassDef.h
deleted file mode 100644
index 8351ba71ec..0000000000
--- a/tests/TestClassDef.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/*  This file is meant to be included by .cpp files, so it can spew out a
-    customized class + global definition.
-
-    e.g.
-    #include "TestClassDef.h"
-
-    DEF_TEST(TestName, reporter) {
-        ...
-        REPORTER_ASSERT(reporter, x == 15);
-    }
-*/
-
-#define DEF_TEST(name, reporter)                                                     \
-    static void name(skiatest::Reporter* reporter);                                  \
-    namespace skiatest {                                                             \
-        class name##Class : public Test {                                            \
-        public:                                                                      \
-            static Test* Factory(void*) { return SkNEW(name##Class); }               \
-        protected:                                                                   \
-            virtual void onGetName(SkString* name) SK_OVERRIDE { name->set(#name); } \
-            virtual void onRun(Reporter* reporter) SK_OVERRIDE { name(reporter); }   \
-        };                                                                           \
-        static TestRegistry gReg_##name##Class(name##Class::Factory);                \
-    }                                                                                \
-    static void name(skiatest::Reporter* reporter)
-
-#define DEF_GPUTEST(name, reporter, factory)                                         \
-    static void name(skiatest::Reporter* reporter, GrContextFactory* factory);       \
-    namespace skiatest {                                                             \
-        class name##Class : public GpuTest {                                         \
-        public:                                                                      \
-            static Test* Factory(void*) { return SkNEW(name##Class); }               \
-        protected:                                                                   \
-            virtual void onGetName(SkString* name) SK_OVERRIDE { name->set(#name); } \
-            virtual void onRun(Reporter* reporter) SK_OVERRIDE {                     \
-                name(reporter, GetGrContextFactory());                               \
-            }                                                                        \
-        };                                                                           \
-        static TestRegistry gReg_##name##Class(name##Class::Factory);                \
-    }                                                                                \
-    static void name(skiatest::Reporter* reporter, GrContextFactory* factory)
diff --git a/tests/TestSize.cpp b/tests/TestSize.cpp
index 475517a075..76a96e7ba2 100644
--- a/tests/TestSize.cpp
+++ b/tests/TestSize.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkSize.h"
 
 static void TestISize(skiatest::Reporter* reporter) {
diff --git a/tests/TileGridTest.cpp b/tests/TileGridTest.cpp
index 4e3d9b9ed3..c86a2bd79e 100644
--- a/tests/TileGridTest.cpp
+++ b/tests/TileGridTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkTileGrid.h"
diff --git a/tests/ToUnicode.cpp b/tests/ToUnicode.cpp
index d6ca3da180..71b8592d21 100644
--- a/tests/ToUnicode.cpp
+++ b/tests/ToUnicode.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkData.h"
 #include "SkPDFTypes.h"
 #include "SkPDFFont.h"
diff --git a/tests/Typeface.cpp b/tests/Typeface.cpp
index d589f23a25..93f1627aad 100644
--- a/tests/Typeface.cpp
+++ b/tests/Typeface.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkTypeface.h"
 
 DEF_TEST(Typeface, reporter) {
diff --git a/tests/UnicodeTest.cpp b/tests/UnicodeTest.cpp
index 68f0ecf990..dc5bc158bd 100644
--- a/tests/UnicodeTest.cpp
+++ b/tests/UnicodeTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkPaint.h"
 #include "SkUtils.h"
 
diff --git a/tests/UnitTestTest.cpp b/tests/UnitTestTest.cpp
index f01b53d09f..d0ed6a112e 100644
--- a/tests/UnitTestTest.cpp
+++ b/tests/UnitTestTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkRTConf.h"
 
 DEF_TEST(UnitTest, reporter) {
diff --git a/tests/UtilsTest.cpp b/tests/UtilsTest.cpp
index dfd0a2fd16..ccea4660a1 100644
--- a/tests/UtilsTest.cpp
+++ b/tests/UtilsTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkRandom.h"
 #include "SkRefCnt.h"
 #include "SkTSearch.h"
diff --git a/tests/WArrayTest.cpp b/tests/WArrayTest.cpp
index 020953f720..11d5ca527d 100644
--- a/tests/WArrayTest.cpp
+++ b/tests/WArrayTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 
 // Include the implementation so we can make an appropriate template instance.
 #include "SkAdvancedTypefaceMetrics.h"
diff --git a/tests/WritePixelsTest.cpp b/tests/WritePixelsTest.cpp
index c20ccd0ca4..99e6d11dda 100644
--- a/tests/WritePixelsTest.cpp
+++ b/tests/WritePixelsTest.cpp
@@ -11,7 +11,6 @@
 #include "SkMathPriv.h"
 #include "SkRegion.h"
 #include "Test.h"
-#include "TestClassDef.h"
 
 #if SK_SUPPORT_GPU
 #include "SkGpuDevice.h"
diff --git a/tests/Writer32Test.cpp b/tests/Writer32Test.cpp
index a76c35d34c..d9f4f9ee4d 100644
--- a/tests/Writer32Test.cpp
+++ b/tests/Writer32Test.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkRandom.h"
 #include "SkReader32.h"
 #include "SkWriter32.h"
diff --git a/tests/XfermodeTest.cpp b/tests/XfermodeTest.cpp
index 8f4d65aec5..878f40d02b 100644
--- a/tests/XfermodeTest.cpp
+++ b/tests/XfermodeTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkColor.h"
 #include "SkXfermode.h"