Reland "Clean up Test's resourcePath code."

bench/SkBenchmark.h

Index: bench/SkBenchmark.h
diff --git a/bench/SkBenchmark.h b/bench/SkBenchmark.h
index bf28689236593b81cf450f29ff88fc197adc7c59..00a816cdba76ca08316b378976023e0adf582662 100644
--- a/bench/SkBenchmark.h
+++ b/bench/SkBenchmark.h
@@ -107,9 +107,8 @@ public:
         fClearMask = clearMask;
     }
 
-    static void SetResourcePath(const char* resPath) { gResourcePath.set(resPath); }
-
-    static SkString& GetResourcePath() { return gResourcePath; }
+    static void SetResourcePath(const char*);
+    static SkString GetResourcePath();
 
 protected:
     virtual void setupPaint(SkPaint* paint);
@@ -129,7 +128,7 @@ private:
     bool    fForceFilter;
     SkTriState::State  fDither;
     uint32_t    fOrMask, fClearMask;
-    static  SkString gResourcePath;
+    static const char* gResourcePath;
 
     typedef SkRefCnt INHERITED;
 };