Reland "Clean up Test's resourcePath code."

tests/Test.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 "SkCommandLineFlags.h"
 #include "SkError.h"
 #include "SkString.h"
 #include "SkTArray.h"
 #include "SkTime.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
@@ skipping 16 matching lines @@
 void Reporter::reportFailed(const SkString& desc) {
     this->onReportFailed(desc);
 }
 
 void Reporter::endTest(Test* test) {
     this->onEnd(test);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
+const char* Test::gResourcePath;
+
 Test::Test() : fReporter(NULL), fPassed(true) {}
 
 Test::~Test() {
     SkSafeUnref(fReporter);
 }
 
 void Test::setReporter(Reporter* r) {
     SkRefCnt_SafeAssign(fReporter, r);
 }
 
@@ skipping 60 matching lines @@
     }
     fReporter->endTest(this);
 
 }
 
 SkString Test::GetTmpDir() {
     const char* tmpDir = FLAGS_tmpDir.isEmpty() ? NULL : FLAGS_tmpDir[0];
     return SkString(tmpDir);
 }
 
-static const char* gResourcePath = NULL;
-void Test::SetResourcePath(const char* resourcePath) { gResourcePath = resourcePath; }
+void Test::SetResourcePath(const char* resourcePath) {
+    gResourcePath = resourcePath;
+}
 
 SkString Test::GetResourcePath() {
     return SkString(gResourcePath);
 }