Reland "Clean up Test's resourcePath code."

gm/etc1bitmap.cpp

 /*
  * Copyright 2014 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"
 #include "SkCanvas.h"
 #include "SkData.h"
@@ skipping 75 matching lines @@
     }
 
     virtual SkISize onISize() SK_OVERRIDE {
         return make_isize(128, 128);
     }
 
     virtual SkString fileExtension() const = 0;
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkBitmap bm;
-        SkString filename = SkOSPath::SkPathJoin(
-                INHERITED::gResourcePath.c_str(), "mandrill_128.");
+        SkString filename = SkOSPath::SkPathJoin(INHERITED::gResourcePath, "mandrill_128.");
         filename.append(this->fileExtension());
 
         SkAutoTUnref<SkData> fileData(SkData::NewFromFileName(filename.c_str()));
         if (NULL == fileData) {
             SkDebugf("Could not open the file. Did you forget to set the resourcePath?\n");
             return;
         }
 
         if (!SkInstallDiscardablePixelRef(
                 SkDecodingImageGenerator::Create(
@@ skipping 54 matching lines @@
         return SkString("etc1bitmap_npot");
     }
 
     virtual SkISize onISize() SK_OVERRIDE {
         return make_isize(124, 124);
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
 
         SkBitmap bm;
-        SkString filename = SkOSPath::SkPathJoin(
-                INHERITED::gResourcePath.c_str(), "mandrill_128.pkm");
+        SkString filename = SkOSPath::SkPathJoin(INHERITED::gResourcePath, "mandrill_128.pkm");
 
         SkAutoDataUnref fileData(SkData::NewFromFileName(filename.c_str()));
         if (NULL == fileData) {
             SkDebugf("Could not open the file. Did you forget to set the resourcePath?\n");
             return;
         }
 
         SkAutoMalloc am(fileData->size());
         memcpy(am.get(), fileData->data(), fileData->size());
 
@@ skipping 27 matching lines @@
 }  // namespace skiagm
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return SkNEW(skiagm::ETC1Bitmap_PKM_GM); )
 DEF_GM( return SkNEW(skiagm::ETC1Bitmap_KTX_GM); )
 
 #ifndef SK_IGNORE_ETC1_SUPPORT
 DEF_GM( return SkNEW(skiagm::ETC1Bitmap_NPOT_GM); )
 #endif  // SK_IGNORE_ETC1_SUPPORT