Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/DequeTest.cpp

-
 /*
  * 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) {
     if (0 == count) {
         REPORTER_ASSERT(reporter, deq.empty());
         REPORTER_ASSERT(reporter, 0 == deq.count());
         REPORTER_ASSERT(reporter, sizeof(int) == deq.elemSize());
         REPORTER_ASSERT(reporter, NULL == deq.front());
         REPORTER_ASSERT(reporter, NULL == deq.back());
     } else {
@@ skipping 135 matching lines @@
     *(int*)deq.push_back() = 3;
     *(int*)deq.push_front() = 7;
     *(int*)deq.push_back() = 2;
     *(int*)deq.push_front() = 8;
     *(int*)deq.push_back() = 1;
     assert_count(reporter, deq, 8);
     assert_iter(reporter, deq, 8, 1);
     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)