Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/WArrayTest.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 "Test.h"
+#include "TestClassDef.h"
 
 // Include the implementation so we can make an appropriate template instance.
 #include "SkAdvancedTypefaceMetrics.h"
 
 using namespace skia_advanced_typeface_metrics_utils;
 
 // Negative values and zeros in a range plus trailing zeros.
 //                        0  1   2  3  4  5  6  7  8  9 10 11 12 13 14
 static const int16_t data1[] = {-1, 0, -3, 4, 5, 6, 7, 0, 0, 0, 8, 0, 0, 0, 0};
 static const char* expected1 = "0[-1 0 -3 4 5 6 7 0 0 0 8]";
@@ skipping 147 matching lines @@
 
         SkString stringResult = stringify_advance_data(result.get());
         if (!stringResult.equals(fExpected)) {
             SkDebugf("Expected: %s\n  Result: %s\n", fExpected, stringResult.c_str());
             return false;
         }
         return true;
     }
 };
 
-static void TestWArray(skiatest::Reporter* reporter) {
+DEF_TEST(WArray, reporter) {
     TestWData(reporter, data1, SK_ARRAY_COUNT(data1), NULL, 0, expected1);
     TestWData(reporter, data2, SK_ARRAY_COUNT(data2), NULL, 0, expected2);
     TestWData(reporter, data3, SK_ARRAY_COUNT(data3), NULL, 0, expected3);
     TestWData(reporter, data4, SK_ARRAY_COUNT(data4), NULL, 0, expected4);
     TestWData(reporter, data5, SK_ARRAY_COUNT(data5), NULL, 0, expected5);
     TestWData(reporter, data6, SK_ARRAY_COUNT(data6), NULL, 0, expected6);
     TestWData(reporter, data7, SK_ARRAY_COUNT(data7), NULL, 0, expected7);
     TestWData(reporter, data7, SK_ARRAY_COUNT(data7), subset7,
               SK_ARRAY_COUNT(subset7), expectedSubset7);
     TestWData(reporter, data8, SK_ARRAY_COUNT(data8), NULL, 0, expected8);
@@ skipping 11 matching lines @@
     TestWData(reporter, data12, SK_ARRAY_COUNT(data12), NULL, 0, expected12);
     TestWData(reporter, data12, SK_ARRAY_COUNT(data12), subset12,
               SK_ARRAY_COUNT(subset12), expectedSubset12);
     TestWData(reporter, data13, SK_ARRAY_COUNT(data13), NULL, 0, expected13);
     TestWData(reporter, data13, SK_ARRAY_COUNT(data13), subset13,
               SK_ARRAY_COUNT(subset13), expectedSubset13);
     TestWData(reporter, data14, SK_ARRAY_COUNT(data14), NULL, 0, expected14);
     TestWData(reporter, data14, SK_ARRAY_COUNT(data14), subset14,
               SK_ARRAY_COUNT(subset14), expectedSubset14);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("WArray", WArrayTest, TestWArray)