Reland "Clean up Test's resourcePath code."

gm/gm.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 "gm.h"
+
 using namespace skiagm;
 
-SkString GM::gResourcePath;
+const char* GM::gResourcePath;
 
 GM::GM() {
     fMode = kGM_Mode;
     fBGColor = SK_ColorWHITE;
     fCanvasIsDeferred = false;
     fHaveCalledOnceBeforeDraw = false;
     fStarterMatrix.reset();
 }
+
 GM::~GM() {}
 
 void GM::draw(SkCanvas* canvas) {
     this->drawBackground(canvas);
     this->drawContent(canvas);
 }
 
 void GM::drawContent(SkCanvas* canvas) {
     if (!fHaveCalledOnceBeforeDraw) {
         fHaveCalledOnceBeforeDraw = true;
@@ skipping 27 matching lines @@
 
 void GM::drawSizeBounds(SkCanvas* canvas, SkColor color) {
     SkISize size = this->getISize();
     SkRect r = SkRect::MakeWH(SkIntToScalar(size.width()),
                               SkIntToScalar(size.height()));
     SkPaint paint;
     paint.setColor(color);
     canvas->drawRect(r, paint);
 }
 
+void GM::SetResourcePath(const char* resourcePath) {
+    gResourcePath = resourcePath;
+}
+
+SkString GM::GetResourcePath() {
+    return SkString(gResourcePath);
+}
+
 // need to explicitly declare this, or we get some weird infinite loop llist
 template GMRegistry* SkTRegistry<GM*(*)(void*)>::gHead;