Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/FlateTest.cpp

Index: tests/FlateTest.cpp
diff --git a/tests/FlateTest.cpp b/tests/FlateTest.cpp
index 879973fc903cb84eb6826b497e9a2fe6a50b8ace..8d5f015979ec80319ca0703c566024628c8a3a3d 100644
--- a/tests/FlateTest.cpp
+++ b/tests/FlateTest.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
@@ -6,11 +5,11 @@
  * found in the LICENSE file.
  */
 
-
 #include <stdlib.h>
 #include <string.h>
 
 #include "Test.h"
+#include "TestClassDef.h"
 #include "SkData.h"
 #include "SkFlate.h"
 #include "SkStream.h"
@@ -85,7 +84,7 @@ static void TestFlate(skiatest::Reporter* reporter, SkMemoryStream* testStream,
                                      testData.getLength()) == 0);
 }
 
-static void TestFlateCompression(skiatest::Reporter* reporter) {
+DEF_TEST(Flate, reporter) {
     TestFlate(reporter, NULL, 0);
 #if defined(SK_ZLIB_INCLUDE) && !defined(SK_DEBUG)
     REPORTER_ASSERT(reporter, SkFlate::HaveFlate());
@@ -99,6 +98,3 @@ static void TestFlateCompression(skiatest::Reporter* reporter) {
     TestFlate(reporter, &fileStream, 10240);
 #endif
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Flate", FlateTestClass, TestFlateCompression)