Use DEFINE_TESTCLASS_SHORT macro in tests.
The three version of DEFINE_TESTCLASS macro is deprecated and thus just
use the simple, short one.
BUG=None
TEST=out/Debug/tests
R=mtklein@google.com, bsalomon@google.com, robertphillips@google.com
Review URL: https://codereview.chromium.org/100113004
git-svn-id: http://skia.googlecode.com/svn/trunk@12653 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/RefCntTest.cpp b/tests/RefCntTest.cpp
index ed771e7..d844596 100644
--- a/tests/RefCntTest.cpp
+++ b/tests/RefCntTest.cpp
@@ -5,15 +5,13 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
#include "Test.h"
-
+#include "TestClassDef.h"
#include "SkRefCnt.h"
-#include "SkThreadUtils.h"
-#include "SkWeakRefCnt.h"
#include "SkTRefArray.h"
-
-///////////////////////////////////////////////////////////////////////////////
+#include "SkThreadUtils.h"
+#include "SkTypes.h"
+#include "SkWeakRefCnt.h"
class InstCounterClass {
public:
@@ -143,11 +141,8 @@
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)