Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/GifTest.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.
  */
 
 // This tests out GIF decoder (SkImageDecoder_libgif.cpp)
 // It is not used on these platforms:
 #if (!defined(SK_BUILD_FOR_WIN32)) &&           \
     (!defined(SK_BUILD_FOR_IOS)) &&             \
     (!defined(SK_BUILD_FOR_MAC))
 
+#include "Test.h"
+#include "TestClassDef.h"
 #include "SkBitmap.h"
 #include "SkData.h"
 #include "SkForceLinking.h"
+#include "SkImage.h"
 #include "SkImageDecoder.h"
-#include "SkImage.h"
 #include "SkStream.h"
-#include "Test.h"
 
 __SK_FORCE_IMAGE_DECODER_LINKING;
 
 namespace {
     unsigned char gifData[] = {
         0x47, 0x49, 0x46, 0x38, 0x37, 0x61, 0x03, 0x00,
         0x03, 0x00, 0xe3, 0x08, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x00,
         0xff, 0x80, 0x80, 0x80, 0x00, 0xff, 0x00, 0x00,
         0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff,
@@ skipping 109 matching lines @@
         REPORTER_ASSERT(r, bm.getColor(1, 1) == 0xff000000);
         REPORTER_ASSERT(r, bm.getColor(2, 1) == 0xff00ff00);
     }
 }
 
 /**
   This test will test the ability of the SkImageDecoder to deal with
   GIF files which have been mangled somehow.  We want to display as
   much of the GIF as possible.
 */
-static void TestGif(skiatest::Reporter* reporter) {
+DEF_TEST(Gif, reporter) {
     // test perfectly good images.
     test_gif_data(reporter, static_cast<void *>(gifData), sizeof(gifData));
     test_interlaced_gif_data(reporter, static_cast<void *>(interlacedGif),
                           sizeof(interlacedGif));
 
     unsigned char badData[sizeof(gifData)];
 
     /* If you set the environment variable
        skia_images_gif_suppressDecoderWarnings to 'false', you will
        see warnings on stderr.  This is a feature.  */
@@ skipping 36 matching lines @@
 
     // test short Gif.  80 is missing a few bytes.
     test_gif_data_short(reporter, static_cast<void *>(gifData), 80);
     // "libgif warning [DGifGetLine]"
 
     test_interlaced_gif_data(reporter, static_cast<void *>(interlacedGif),
                              100);  // 100 is missing a few bytes
     // "libgif warning [interlace DGifGetLine]"
 }
 
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("GifTest", GifTestClass, TestGif)
-
 #endif  // !(SK_BUILD_FOR_WIN32||SK_BUILD_FOR_IOS||SK_BUILD_FOR_MAC)