Cleanup usage of GetResourcePath() after commit bcbc1788b478b1e54079318ad073e8490aa66fae.

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 "Resources.h"
@@ skipping 77 matching lines @@
     }
 
     virtual SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(128, 128);
     }
 
     virtual SkString fileExtension() const = 0;
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkBitmap bm;
-        SkString resourcePath = GetResourcePath();
-        SkString filename = SkOSPath::SkPathJoin(resourcePath.c_str(), "mandrill_128.");
+        SkString filename = GetResourcePath("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(
                     fileData, SkDecodingImageGenerator::Options()), &bm)) {
             SkDebugf("Could not install discardable pixel ref.\n");
@@ skipping 51 matching lines @@
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("etc1bitmap_npot");
     }
 
     virtual SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(124, 124);
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkBitmap bm;
-        SkString resourcePath = GetResourcePath();
-        SkString filename = SkOSPath::SkPathJoin(resourcePath.c_str(), "mandrill_128.pkm");
-
-        SkAutoDataUnref fileData(SkData::NewFromFileName(filename.c_str()));
+        SkString pkmFilename = GetResourcePath("mandrill_128.pkm");
+        SkAutoDataUnref fileData(SkData::NewFromFileName(pkmFilename.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());
 
         int width, height;
         if (!slice_etc1_data(am.get(), &width, &height)) {
@@ skipping 25 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