Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/ImageDecodingTest.cpp

 /*
  * Copyright 2013 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 "SkCanvas.h"
 #include "SkColor.h"
 #include "SkColorPriv.h"
 #include "SkData.h"
 #include "SkForceLinking.h"
 #include "SkGradientShader.h"
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkOSFile.h"
 #include "SkPoint.h"
 #include "SkShader.h"
 #include "SkStream.h"
 #include "SkString.h"
-#include "Test.h"
 
 __SK_FORCE_IMAGE_DECODER_LINKING;
 
 /**
  *  Interprets c as an unpremultiplied color, and returns the
  *  premultiplied equivalent.
  */
 static SkPMColor premultiply_unpmcolor(SkPMColor c) {
     U8CPU a = SkGetPackedA32(c);
     U8CPU r = SkGetPackedR32(c);
@@ skipping 188 matching lines @@
         decoder->decodeSubset(&bm, SkIRect::MakeWH(width, height),
                               SkBitmap::kARGB_8888_Config);
     }
 }
 
 // Test inside SkScaledBitmapSampler.cpp
 extern void test_row_proc_choice();
 
 #endif // SK_DEBUG
 
-static void test_imageDecodingTests(skiatest::Reporter* reporter) {
+DEF_TEST(ImageDecoding, reporter) {
     test_unpremul(reporter);
 #ifdef SK_DEBUG
     test_stream_life();
     test_row_proc_choice();
 #endif
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("ImageDecoding", ImageDecodingTestClass,
-                 test_imageDecodingTests)