Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/PipeTest.cpp

Index: tests/PipeTest.cpp
diff --git a/tests/PipeTest.cpp b/tests/PipeTest.cpp
index acf288ae8df0981fc36e442454bbbecde4e51a47..e18b3ae192a8dff7fdad856cae4d4827a2e78d2c 100644
--- a/tests/PipeTest.cpp
+++ b/tests/PipeTest.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2012 Google Inc.
  *
@@ -6,13 +5,14 @@
  * found in the LICENSE file.
  */
 
+#include "Test.h"
+#include "TestClassDef.h"
 #include "SamplePipeControllers.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkGPipe.h"
 #include "SkPaint.h"
 #include "SkShader.h"
-#include "Test.h"
 
 // Ensures that the pipe gracefully handles drawing an invalid bitmap.
 static void testDrawingBadBitmap(SkCanvas* pipeCanvas) {
@@ -43,7 +43,7 @@ static void testDrawingAfterEndRecording(SkCanvas* canvas) {
     pipeCanvas->drawBitmap(bm, 0, 0);
 }
 
-static void test_pipeTests(skiatest::Reporter*) {
+DEF_TEST(Pipe, reporter) {
     SkBitmap bitmap;
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, 64, 64);
     SkCanvas canvas(bitmap);
@@ -56,6 +56,3 @@ static void test_pipeTests(skiatest::Reporter*) {
 
     testDrawingAfterEndRecording(&canvas);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("PipeTest", PipeTestClass, test_pipeTests)