Refactor how we handle resources path in Tests.

gm/cmykjpeg.cpp

Index: gm/cmykjpeg.cpp
diff --git a/gm/cmykjpeg.cpp b/gm/cmykjpeg.cpp
index 2d0c275b8ded563001edaedef1c727cf6ed00c28..a1a12dc3885b41ce7e368c6830e1f0bd57800965 100644
--- a/gm/cmykjpeg.cpp
+++ b/gm/cmykjpeg.cpp
@@ -6,6 +6,8 @@
  */
 
 #include "gm.h"
+
+#include "Resources.h"
 #include "SkCanvas.h"
 #include "SkImageDecoder.h"
 #include "SkStream.h"
@@ -21,18 +23,17 @@ public:
 
 protected:
     virtual void onOnceBeforeDraw() SK_OVERRIDE {
-
         // parameters to the "decode" call
         bool dither = false;
 
-        SkString filename(INHERITED::gResourcePath);
-        if (!filename.endsWith("/") && !filename.endsWith("\\")) {
-            filename.append("/");
+        SkString resourcePath = GetResourcePath();

[mtklein, 2014/06/18 18:02:55]

Do you have any inclination to do a follow up to turn code like this into just
SkString resourcePath = GetResourcePath("CMYK.jpg"); ?  Should be almost every
file using GetResourcePath() must be doing their own join-directory-and-filename
thing that can all be cleaned up.

[tfarina, 2014/06/18 19:58:23]

I'll change that in a follow up.

I think it will make the reviewer's life easier (and mine too, in case I make
any mistake).

+        if (!resourcePath.endsWith("/") && !resourcePath.endsWith("\\")) {
+            resourcePath.append("/");
         }
 
-        filename.append("CMYK.jpg");
+        resourcePath.append("CMYK.jpg");
 
-        SkFILEStream stream(filename.c_str());
+        SkFILEStream stream(resourcePath.c_str());
         if (!stream.isValid()) {
             SkDebugf("Could not find CMYK.jpg, please set --resourcePath correctly.\n");
             return;