Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/QuickRejectTest.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 "SkCanvas.h"
 #include "SkDrawLooper.h"
-#include "Test.h"
 
 /*
  *  Subclass of looper that just draws once, with an offset in X.
  */
 class TestLooper : public SkDrawLooper {
 public:
     bool fOnce;
 
     virtual void init(SkCanvas*) SK_OVERRIDE {
         fOnce = true;
@@ skipping 48 matching lines @@
 
     // now install our looper, which will draw, since it internally translates
     // to the left. The test is to ensure that canvas' quickReject machinary
     // allows us through, even though sans-looper we would look like we should
     // be clipped out.
     paint.setLooper(new TestLooper)->unref();
     canvas.drawBitmap(src, SkIntToScalar(-10), 0, &paint);
     REPORTER_ASSERT(reporter, 0xFFFFFFFF == *dst.getAddr32(5, 5));
 }
 
-static void test(skiatest::Reporter* reporter) {
+DEF_TEST(QuickReject, reporter) {
     test_drawBitmap(reporter);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("QuickReject", QuickRejectClass, test)