Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/UtilsTest.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 "SkRandom.h"
 #include "SkRefCnt.h"
 #include "SkTSearch.h"
 #include "SkTSort.h"
 #include "SkUtils.h"
 
 class RefClass : public SkRefCnt {
 public:
     SK_DECLARE_INST_COUNT(RefClass)
 
@@ skipping 157 matching lines @@
         REPORTER_ASSERT(reporter, count == 2);
         size_t count2 = SkUTF16_CountUnichars(buf, 2);
         REPORTER_ASSERT(reporter, count2 == 1);
         const uint16_t* ptr = buf;
         SkUnichar c = SkUTF16_NextUnichar(&ptr);
         REPORTER_ASSERT(reporter, c == gUni[i]);
         REPORTER_ASSERT(reporter, ptr - buf == 2);
     }
 }
 
-static void TestUTF(skiatest::Reporter* reporter) {
+DEF_TEST(Utils, reporter) {
     static const struct {
         const char* fUtf8;
         SkUnichar   fUni;
     } gTest[] = {
         { "a",                  'a' },
         { "\x7f",               0x7f },
         { "\xC2\x80",           0x80 },
         { "\xC3\x83",           (3 << 6) | 3    },
         { "\xDF\xBF",           0x7ff },
         { "\xE0\xA0\x80",       0x800 },
@@ skipping 15 matching lines @@
         REPORTER_ASSERT(reporter, u0 == gTest[i].fUni);
         REPORTER_ASSERT(reporter,
                         p - gTest[i].fUtf8 == (int)strlen(gTest[i].fUtf8));
     }
 
     test_utf16(reporter);
     test_search(reporter);
     test_autounref(reporter);
     test_autostarray(reporter);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Utils", UtfTestClass, TestUTF)