Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/ToUnicode.cpp

-
 /*
  * Copyright 2010 The Android Open Source Project
  *
  * 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 "SkData.h"
 #include "SkPDFTypes.h"
 #include "SkPDFFont.h"
 #include "SkStream.h"
 
 static bool stream_equals(const SkDynamicMemoryWStream& stream, size_t offset,
                           const char* buffer, size_t len) {
     SkAutoDataUnref data(stream.copyToData());
     if (offset + len > data->size()) {
         return false;
     }
     if (len != strlen(buffer)) {
         return false;
     }
     return memcmp(data->bytes() + offset, buffer, len) == 0;
 }
 
 void append_cmap_sections(const SkTDArray<SkUnichar>& glyphToUnicode,
                           const SkPDFGlyphSet* subset,
                           SkDynamicMemoryWStream* cmap,
                           bool multiByteGlyphs,
                           uint16_t firstGlypthID,
                           uint16_t lastGlypthID);
 
-static void TestToUnicode(skiatest::Reporter* reporter) {
+DEF_TEST(ToUnicode, reporter) {
     SkTDArray<SkUnichar> glyphToUnicode;
     SkTDArray<uint16_t> glyphsInSubset;
     SkPDFGlyphSet subset;
 
     glyphToUnicode.push(0);  // 0
     glyphToUnicode.push(0);  // 1
     glyphToUnicode.push(0);  // 2
     glyphsInSubset.push(3);
     glyphToUnicode.push(0x20);  // 3
     glyphsInSubset.push(4);
@@ skipping 127 matching lines @@
 <004F> <006C>\n\
 <0051> <006E>\n\
 endbfchar\n\
 1 beginbfrange\n\
 <0056> <0057> <0073>\n\
 endbfrange\n";
 
     REPORTER_ASSERT(reporter, stream_equals(buffer2, 0, expectedResult2,
                                             buffer2.getOffset()));
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("ToUnicode", ToUnicodeTestClass, TestToUnicode)