Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/DequeTest.cpp

Index: tests/DequeTest.cpp
diff --git a/tests/DequeTest.cpp b/tests/DequeTest.cpp
index 62e8e4db7dc61769ddcfb1558025c9fd8022c1ca..d3e1c175feb7d5fb476029503294352b2d86c25a 100644
--- a/tests/DequeTest.cpp
+++ b/tests/DequeTest.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 "SkDeque.h"
 
 static void assert_count(skiatest::Reporter* reporter, const SkDeque& deq, int count) {
@@ -161,11 +162,9 @@ static void TestSub(skiatest::Reporter* reporter, int allocCount) {
     assert_blocks(reporter, deq, allocCount);
 }
 
-static void TestDeque(skiatest::Reporter* reporter) {
+DEF_TEST(Deque, reporter) {
     // test it once with the default allocation count
     TestSub(reporter, 1);
     // test it again with a generous allocation count
     TestSub(reporter, 10);
 }
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Deque", TestDequeClass, TestDeque)