Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/JpegTest.cpp

Index: tests/JpegTest.cpp
diff --git a/tests/JpegTest.cpp b/tests/JpegTest.cpp
index ac2ec8a02dfc6e9c473cd437a07abf25b8fd1b28..4d00eece2a71afbb95bb79f9b20810d5a333e2e9 100644
--- a/tests/JpegTest.cpp
+++ b/tests/JpegTest.cpp
@@ -5,13 +5,14 @@
  * found in the LICENSE file.
  */
 
+#include "Test.h"
+#include "TestClassDef.h"
 #include "SkBitmap.h"
 #include "SkData.h"
 #include "SkForceLinking.h"
 #include "SkImageDecoder.h"
 #include "SkImage.h"
 #include "SkStream.h"
-#include "Test.h"
 
 __SK_FORCE_IMAGE_DECODER_LINKING;
 
@@ -417,7 +418,7 @@ static const int goodJpegImageHeight = 128;
   Jpeg files which have been mangled somehow.  We want to display as
   much of the jpeg as possible.
 */
-static void TestJpeg(skiatest::Reporter* reporter) {
+DEF_TEST(Jpeg, reporter) {
     size_t len = sizeof(goodJpegImage) / 2;
     // I am explicitly not putting the entire image into the
     // DecodeMemory.  This simulates a network error.
@@ -447,6 +448,3 @@ static void TestJpeg(skiatest::Reporter* reporter) {
     SkASSERT(writeSuccess);
     #endif
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("JpegTest", JpegTestClass, TestJpeg)