Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/JpegTest.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 "SkData.h"
 #include "SkForceLinking.h"
 #include "SkImageDecoder.h"
 #include "SkImage.h"
 #include "SkStream.h"
-#include "Test.h"
 
 __SK_FORCE_IMAGE_DECODER_LINKING;
 
 #define JPEG_TEST_WRITE_TO_FILE_FOR_DEBUGGING 0  // do not do this for
                                                  // normal unit testing.
 static unsigned char goodJpegImage[] = {
 0xFF, 0xD8, 0xFF, 0xE0, 0x00, 0x10, 0x4A, 0x46,
 0x49, 0x46, 0x00, 0x01, 0x01, 0x01, 0x00, 0x8F,
 0x00, 0x8F, 0x00, 0x00, 0xFF, 0xDB, 0x00, 0x43,
 0x00, 0x05, 0x03, 0x04, 0x04, 0x04, 0x03, 0x05,
@@ skipping 385 matching lines @@
 
 // https://code.google.com/p/android/issues/detail?id=42382
 // https://code.google.com/p/android/issues/detail?id=9064
 // https://code.google.com/p/skia/issues/detail?id=1649
 
 /**
   This test will test the ability of the SkImageDecoder to deal with
   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.
 
     SkBitmap bm8888;
     bool imageDecodeSuccess = SkImageDecoder::DecodeMemory(
         static_cast<void *>(goodJpegImage), len, &bm8888);
     REPORTER_ASSERT(reporter, imageDecodeSuccess);
     REPORTER_ASSERT(reporter, bm8888.width() == goodJpegImageWidth);
     REPORTER_ASSERT(reporter, bm8888.height() == goodJpegImageHeight);
     REPORTER_ASSERT(reporter, !(bm8888.empty()));
 
     // Pick a few pixels and verify that their colors match the colors
     // we expect (given the original image).
     REPORTER_ASSERT(reporter, bm8888.getColor(7, 9) == 0xffffffff);
     REPORTER_ASSERT(reporter, bm8888.getColor(28, 3) == 0xff000000);
     REPORTER_ASSERT(reporter, bm8888.getColor(27, 34) == 0xffffffff);
     REPORTER_ASSERT(reporter, bm8888.getColor(71, 18) == 0xff000000);
 
     // This is the fill color
     REPORTER_ASSERT(reporter, bm8888.getColor(127, 127) == SK_ColorWHITE);
 
     #if JPEG_TEST_WRITE_TO_FILE_FOR_DEBUGGING
     // Check to see that the resulting bitmap is nice
     bool writeSuccess = (!(bm8888.empty())) && SkImageEncoder::EncodeFile(
         "HalfOfAJpeg.png", bm8888, SkImageEncoder::kPNG_Type, 100);
     SkASSERT(writeSuccess);
     #endif
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("JpegTest", JpegTestClass, TestJpeg)