Reland "Clean up Test's resourcePath code."

bench/SkBenchmark.cpp

Index: bench/SkBenchmark.cpp
diff --git a/bench/SkBenchmark.cpp b/bench/SkBenchmark.cpp
index d995415632d500fe563dbabcd860f5e2b0b8251d..1f12ed339f71bd40e77ec95f21ca95823dd033be 100644
--- a/bench/SkBenchmark.cpp
+++ b/bench/SkBenchmark.cpp
@@ -12,7 +12,7 @@ const char* SkTriState::Name[] = { "default", "true", "false" };
 
 template BenchRegistry* BenchRegistry::gHead;
 
-SkString SkBenchmark::gResourcePath;
+const char* SkBenchmark::gResourcePath;
 
 SkBenchmark::SkBenchmark() {
     fForceAlpha = 0xFF;
@@ -55,6 +55,13 @@ void SkBenchmark::setupPaint(SkPaint* paint) {
     }
 }
 
+void SkBenchmark::SetResourcePath(const char* resourcePath) {
+    gResourcePath = resourcePath;
+}
+
+SkString SkBenchmark::GetResourcePath() {
+    return SkString(gResourcePath);
+}
 
 ///////////////////////////////////////////////////////////////////////////////