Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/BitmapCopyTest.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "Test.h"
+#include "TestClassDef.h"
 #include "SkBitmap.h"
 #include "SkRect.h"
 
 static const char* boolStr(bool value) {
     return value ? "true" : "false";
 }
 
 // these are in the same order as the SkBitmap::Config enum
 static const char* gConfigName[] = {
     "None", "A8", "Index8", "565", "4444", "8888"
@@ skipping 178 matching lines @@
         reporter->reportFailed(str);
     }
 }
 
 // Writes unique pixel values at locations specified by coords.
 static void writeCoordPixels(SkBitmap& bm, const Coordinates& coords) {
     for (int i = 0; i < coords.length; ++i)
         setPixel(coords[i]->fX, coords[i]->fY, i, bm);
 }
 
-static void TestBitmapCopy(skiatest::Reporter* reporter) {
+DEF_TEST(BitmapCopy, reporter) {
     static const Pair gPairs[] = {
         { SkBitmap::kNo_Config,         "0000000"  },
         { SkBitmap::kA8_Config,         "0101010"  },
         { SkBitmap::kIndex8_Config,     "0111010"  },
         { SkBitmap::kRGB_565_Config,    "0101010"  },
         { SkBitmap::kARGB_4444_Config,  "0101110"  },
         { SkBitmap::kARGB_8888_Config,  "0101110"  },
     };
 
     static const bool isExtracted[] = {
@@ skipping 325 matching lines @@
                 // for the transfer.
                 REPORTER_ASSERT(reporter,
                     subset.copyPixelsFrom(buf, 1, subset.rowBytes()) ==
                         false);
 
 #endif
             }
         } // for (size_t copyCase ...
     }
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("BitmapCopy", TestBitmapCopyClass, TestBitmapCopy)