Reland "Clean up Test's resourcePath code."

bench/SkBenchmark.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 "SkBenchmark.h"
 #include "SkPaint.h"
 #include "SkParse.h"
 
 const char* SkTriState::Name[] = { "default", "true", "false" };
 
 template BenchRegistry* BenchRegistry::gHead;
 
-SkString SkBenchmark::gResourcePath;
+const char* SkBenchmark::gResourcePath;
 
 SkBenchmark::SkBenchmark() {
     fForceAlpha = 0xFF;
     fForceAA = true;
     fForceFilter = false;
     fDither = SkTriState::kDefault;
     fOrMask = fClearMask = 0;
 }
 
 const char* SkBenchmark::getName() {
@@ skipping 22 matching lines @@
     paint->setFilterLevel(fForceFilter ? SkPaint::kLow_FilterLevel
                                        : SkPaint::kNone_FilterLevel);
 
     paint->setFlags((paint->getFlags() & ~fClearMask) | fOrMask);
 
     if (SkTriState::kDefault != fDither) {
         paint->setDither(SkTriState::kTrue == fDither);
     }
 }
 
+void SkBenchmark::SetResourcePath(const char* resourcePath) {
+    gResourcePath = resourcePath;
+}
+
+SkString SkBenchmark::GetResourcePath() {
+    return SkString(gResourcePath);
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkIPoint SkBenchmark::onGetSize() {
     return SkIPoint::Make(640, 480);
 }