Reland "Clean up Test's resourcePath code."

gm/gm.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef skiagm_DEFINED
 #define skiagm_DEFINED
 
@@ skipping 78 matching lines @@
             return matrix;
         }
 
         SkColor getBGColor() const { return fBGColor; }
         void setBGColor(SkColor);
 
         // helper: fill a rect in the specified color based on the
         // GM's getISize bounds.
         void drawSizeBounds(SkCanvas*, SkColor);
 
-        static void SetResourcePath(const char* resourcePath) {
-            gResourcePath = resourcePath;
-        }
-
-        static SkString& GetResourcePath() {
-            return gResourcePath;
-        }
+        static void SetResourcePath(const char*);
+        static SkString GetResourcePath();
 
         bool isCanvasDeferred() const { return fCanvasIsDeferred; }
         void setCanvasIsDeferred(bool isDeferred) {
             fCanvasIsDeferred = isDeferred;
         }
 
         const SkMatrix& getStarterMatrix() { return fStarterMatrix; }
         void setStarterMatrix(const SkMatrix& matrix) {
             fStarterMatrix = matrix;
         }
 
     protected:
-        static SkString gResourcePath;
+        static const char* gResourcePath;
 
         virtual void onOnceBeforeDraw() {}
         virtual void onDraw(SkCanvas*) = 0;
         virtual void onDrawBackground(SkCanvas*);
         virtual SkISize onISize() = 0;
         virtual SkString onShortName() = 0;
         virtual uint32_t onGetFlags() const { return 0; }
         virtual SkMatrix onGetInitialTransform() const { return SkMatrix::I(); }
 
     private:
         Mode     fMode;
         SkString fShortName;
         SkColor  fBGColor;
         bool     fCanvasIsDeferred; // work-around problem in srcmode.cpp
         bool     fHaveCalledOnceBeforeDraw;
         SkMatrix fStarterMatrix;
     };
 
     typedef SkTRegistry<GM*(*)(void*)> GMRegistry;
 }
 
 #endif