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/TestSize.cpp b/tests/TestSize.cpp
index 6a9a887..475517a 100644
--- a/tests/TestSize.cpp
+++ b/tests/TestSize.cpp
@@ -1,11 +1,12 @@
-
/*
* 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 "SkSize.h"
static void TestISize(skiatest::Reporter* reporter) {
@@ -30,7 +31,7 @@
a.fWidth == b.fWidth && a.fHeight == b.fHeight);
}
-static void TestSize(skiatest::Reporter* reporter) {
+DEF_TEST(Size, reporter) {
TestISize(reporter);
SkSize a, b;
@@ -61,7 +62,4 @@
ia.set(ix, iy);
a.set(x, y);
REPORTER_ASSERT(reporter, a.toRound() == ia);
-};
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Size", TestSizeClass, TestSize)
+}