Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/FontNamesTest.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 "SkCommandLineFlags.h"
 #include "SkFontMgr.h"
 #include "SkOTTable_name.h"
 #include "SkTypeface.h"
 
 #include <stddef.h>
 
 template <size_t R, size_t D> struct Format0NameTable {
     SkOTTableName header;
     SkOTTableName::Record nameRecord[R];
@@ skipping 191 matching lines @@
 
             if (verbose) {
                 SkDebugf("\n");
             }
         }
     }
 }
 
 DEFINE_bool(verboseFontNames, false, "verbose FontNames test.");
 
-static void TestFontNames(skiatest::Reporter* reporter) {
+DEF_TEST(FontNames, reporter) {
     test_synthetic(reporter, FLAGS_verboseFontNames);
     test_systemfonts(reporter, FLAGS_verboseFontNames);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("FontNames", FontNamesTestClass, TestFontNames)