Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/PackBitsTest.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 "SkPackBits.h"
 
 static const uint16_t gTest0[] = { 0, 0, 1, 1 };
 static const uint16_t gTest1[] = { 1, 2, 3, 4, 5, 6 };
 static const uint16_t gTest2[] = { 0, 0, 0, 1, 2, 3, 3, 3 };
 static const uint16_t gTest3[] = { 0, 0, 0, 0, 0, 0, 1, 2, 3, 3, 3, 0, 0, 1 };
 
 #include "SkRandom.h"
 static SkRandom gRand;
 static void rand_fill(uint16_t buffer[], int count) {
@@ skipping 99 matching lines @@
                     write = size - skip;
                 }
                 SkPackBits::Unpack8(src, skip, write, dst);
                 bool match = memcmp(src, src2 + skip, write) == 0;
                 REPORTER_ASSERT(reporter, match);
             }
         }
     }
 }
 
-static void TestPackBits(skiatest::Reporter* reporter) {
+DEF_TEST(PackBits, reporter) {
     test_pack8(reporter);
     test_pack16(reporter);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("PackBits", PackBitsTestClass, TestPackBits)