Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/FlateTest.cpp

-
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * 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"
 
 // A memory stream that reports zero size with the standard call, like
 // an unseekable file stream would.
 class SkZeroSizeMemStream : public SkMemoryStream {
 public:
     virtual size_t read(void* buffer, size_t size) {
         if (buffer == NULL && size == 0)
@@ skipping 54 matching lines @@
                                      data1->size()) == 0);
 
     // Check that the uncompressed data matches the source data.
     SkAutoDataUnref data2(uncompressed.copyToData());
     REPORTER_ASSERT(reporter, testData.getLength() == uncompressed.getOffset());
     REPORTER_ASSERT(reporter, memcmp(testData.getMemoryBase(),
                                      data2->data(),
                                      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());
 
     SkMemoryStream memStream;
     TestFlate(reporter, &memStream, 512);
     TestFlate(reporter, &memStream, 10240);
 
     SkZeroSizeMemStream fileStream;
     TestFlate(reporter, &fileStream, 512);
     TestFlate(reporter, &fileStream, 10240);
 #endif
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Flate", FlateTestClass, TestFlateCompression)