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/MemsetTest.cpp b/tests/MemsetTest.cpp
index 9da7850..36d0f0a 100644
--- a/tests/MemsetTest.cpp
+++ b/tests/MemsetTest.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "Test.h"
+#include "TestClassDef.h"
 #include "SkChunkAlloc.h"
 #include "SkUtils.h"
 
@@ -115,12 +116,9 @@
  *  For performance considerations, implementations may take different paths
  *  depending on the alignment of the dst, and/or the size of the count.
  */
-static void TestMemset(skiatest::Reporter* reporter) {
+DEF_TEST(Memset, reporter) {
     test_16(reporter);
     test_32(reporter);
 
     test_chunkalloc(reporter);
-};
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Memset", TestMemsetClass, TestMemset)
+}