Cleanup usage of GetResourcePath() after commit bcbc1788b478b1e54079318ad073e8490aa66fae.

tests/KtxTest.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 "Resources.h"
 #include "SkBitmap.h"
 #include "SkData.h"
@@ skipping 123 matching lines @@
         row += decodedBitmap.rowBytes();
     }
 }
 
 /**
  * Finally, make sure that if we get ETC1 data from a PKM file that we can then
  * accurately write it out into a KTX file (i.e. transferring the ETC1 data from
  * the PKM to the KTX should produce an identical KTX to the one we have on file)
  */
 DEF_TEST(KtxReexportPKM, reporter) {
-    SkString resourcePath = GetResourcePath();
-    SkString filename = SkOSPath::SkPathJoin(resourcePath.c_str(), "mandrill_128.pkm");
+    SkString pkmFilename = GetResourcePath("mandrill_128.pkm");
 
     // Load PKM file into a bitmap
     SkBitmap etcBitmap;
-    SkAutoTUnref<SkData> fileData(SkData::NewFromFileName(filename.c_str()));
+    SkAutoTUnref<SkData> fileData(SkData::NewFromFileName(pkmFilename.c_str()));
     REPORTER_ASSERT(reporter, NULL != fileData);
 
     bool installDiscardablePixelRefSuccess =
         SkInstallDiscardablePixelRef(
             SkDecodingImageGenerator::Create(
                 fileData, SkDecodingImageGenerator::Options()), &etcBitmap);
     REPORTER_ASSERT(reporter, installDiscardablePixelRefSuccess);
 
     // Write the bitmap out to a KTX file.
     SkData *ktxDataPtr = SkImageEncoder::EncodeData(etcBitmap, SkImageEncoder::kKTX_Type, 0);
     SkAutoDataUnref newKtxData(ktxDataPtr);
     REPORTER_ASSERT(reporter, NULL != ktxDataPtr);
 
     // See is this data is identical to data in existing ktx file.
-    SkString ktxFilename = SkOSPath::SkPathJoin(resourcePath.c_str(), "mandrill_128.ktx");
+    SkString ktxFilename = GetResourcePath("mandrill_128.ktx");
     SkAutoDataUnref oldKtxData(SkData::NewFromFileName(ktxFilename.c_str()));
     REPORTER_ASSERT(reporter, oldKtxData->equals(newKtxData));
 }