Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/StreamTest.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 "SkRandom.h"
 #include "SkOSFile.h"
 #include "SkStream.h"
 #include "SkData.h"
 
 #ifndef SK_BUILD_FOR_WIN
 #include <unistd.h>
 #include <fcntl.h>
 #endif
 
@@ skipping 161 matching lines @@
 static void TestNullData() {
     SkData* nullData = NULL;
     SkMemoryStream memStream(nullData);
     TestDereferencingData(&memStream);
 
     memStream.setData(nullData);
     TestDereferencingData(&memStream);
 
 }
 
-static void TestStreams(skiatest::Reporter* reporter) {
+DEF_TEST(Stream, reporter) {
     TestWStream(reporter);
     TestPackedUInt(reporter);
     TestNullData();
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Stream", StreamTestClass, TestStreams)