Simplify skiatest framework.

tests/DataRefTest.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 "SkData.h"
 #include "SkDataTable.h"
 #include "SkOSFile.h"
@@ skipping 156 matching lines @@
     SkAutoTUnref<SkData> r1(SkData::NewWithCString(str));
 
     REPORTER_ASSERT(reporter, r0->equals(r1));
 
     SkAutoTUnref<SkData> r2(SkData::NewWithCString(NULL));
     REPORTER_ASSERT(reporter, 1 == r2->size());
     REPORTER_ASSERT(reporter, 0 == *r2->bytes());
 }
 
 static void test_files(skiatest::Reporter* reporter) {
-    SkString tmpDir = skiatest::Test::GetTmpDir();
+    SkString tmpDir = skiatest::GetTmpDir();
     if (tmpDir.isEmpty()) {
         return;
     }
 
     SkString path = SkOSPath::Join(tmpDir.c_str(), "data_test");
 
     const char s[] = "abcdefghijklmnopqrstuvwxyz";
     {
         SkFILEWStream writer(path.c_str());
         if (!writer.isValid()) {
@@ skipping 37 matching lines @@
     SkData* tmp = SkData::NewSubset(r1, strlen(str), 10);
     assert_len(reporter, tmp, 0);
     tmp->unref();
     tmp = SkData::NewSubset(r1, 0, 0);
     assert_len(reporter, tmp, 0);
     tmp->unref();
 
     test_cstring(reporter);
     test_files(reporter);
 }