Fix bug in setting directories for tests.

tests/Test.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 skiatest_Test_DEFINED
 #define skiatest_Test_DEFINED
 
@@ skipping 57 matching lines @@
         virtual ~Test();
 
         Reporter* getReporter() const { return fReporter; }
         void setReporter(Reporter*);
 
         const char* getName();
         void run();
         bool passed() const { return fPassed; }
         SkMSec elapsedMs() const { return fElapsed; }
 
-        static const SkString& GetTmpDir();
+        static SkString GetTmpDir();
 
-        static const SkString& GetResourcePath();
+        static SkString GetResourcePath();
 
         virtual bool isThreadsafe() const { return true; }
 
     protected:
         virtual void onGetName(SkString*) = 0;
         virtual void onRun(Reporter*) = 0;
 
     private:
         Reporter*   fReporter;
         SkString    fName;
@@ skipping 26 matching lines @@
     do {                                                                     \
         if (!(cond)) {                                                       \
             SkString desc;                                                   \
             desc.printf("%s %s:%d: %s", message, __FILE__, __LINE__, #cond); \
             r->reportFailed(desc);                                           \
         }                                                                    \
     } while(0)
 
 
 #endif