Reland "Clean up Test's resourcePath code."

bench/SkipZeroesBench.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBenchmark.h"
 #include "SkBitmap.h"
 #include "SkData.h"
@@ skipping 27 matching lines @@
     virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
         return backend == kNonRendering_Backend;
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fName.c_str();
     }
 
     virtual void onPreDraw() SK_OVERRIDE {
-        const char* resPath = GetResourcePath().c_str();
-        if (NULL == resPath) {
+        SkString resourcePath = GetResourcePath();
+        if (resourcePath.isEmpty()) {
             fValid = false;
             return;
         }
 
-        SkString fullPath = SkOSPath::SkPathJoin(resPath, fFilename.c_str());
+        SkString fullPath = SkOSPath::SkPathJoin(resourcePath.c_str(),
+                                                 fFilename.c_str());
         SkFILEStream fileStream(fullPath.c_str());
         fValid = fileStream.isValid() && fileStream.getLength() > 0;
         if (fValid) {
             const size_t size = fileStream.getLength();
             void* data = sk_malloc_throw(size);
             if (fileStream.read(data, size) < size) {
                 fValid = false;
             } else {
                 SkAutoTUnref<SkData> skdata(SkData::NewFromMalloc(data, size));
                 fStream.setData(skdata.get());
@@ skipping 42 matching lines @@
     SkMemoryStream                  fStream;
     bool                            fSkipZeroes;
     bool                            fValid;
 
     typedef SkBenchmark INHERITED;
 };
 
 // Enable the true version once the feature is checked in.
 DEF_BENCH( return SkNEW_ARGS(SkipZeroesBench, ("arrow.png", true)));
 DEF_BENCH( return SkNEW_ARGS(SkipZeroesBench, ("arrow.png", false)));