Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/RefCntTest.cpp

 /*
  * Copyright 2012 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 "SkRefCnt.h"
+#include "SkTRefArray.h"
+#include "SkThreadUtils.h"
 #include "SkTypes.h"
-#include "Test.h"
-
-#include "SkRefCnt.h"
-#include "SkThreadUtils.h"
 #include "SkWeakRefCnt.h"
-#include "SkTRefArray.h"
-
-///////////////////////////////////////////////////////////////////////////////
 
 class InstCounterClass {
 public:
     InstCounterClass() { fCount = gInstCounter++; }
     InstCounterClass(const InstCounterClass& src) {
         fCount = src.fCount;
         gInstCounter += 1;
     }
     virtual ~InstCounterClass() { gInstCounter -= 1; }
 
@@ skipping 109 matching lines @@
     thing1.join();
     thing2.join();
     thing3.join();
     thing4.join();
 
     REPORTER_ASSERT(reporter, ref->getRefCnt() == 1);
     REPORTER_ASSERT(reporter, ref->getWeakCnt() == 1);
     ref->unref();
 }
 
-static void test_refCntTests(skiatest::Reporter* reporter) {
+DEF_TEST(RefCnt, reporter) {
     test_refCnt(reporter);
     test_weakRefCnt(reporter);
     test_refarray(reporter);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("RefCnt", RefCntTestClass, test_refCntTests)