Major bench refactoring.

bench/PathIterBench.cpp

Index: bench/PathIterBench.cpp
diff --git a/bench/PathIterBench.cpp b/bench/PathIterBench.cpp
index 987a752ad96a542d9d0e10479930dfa040d654f7..c5ac7e4b60dfa930c5a9340a84a1e81719c332e7 100644
--- a/bench/PathIterBench.cpp
+++ b/bench/PathIterBench.cpp
@@ -30,8 +30,6 @@ class PathIterBench : public SkBenchmark {
     SkPath      fPath;
     bool        fRaw;
 
-    enum { N = SkBENCHLOOP(500) };
-
 public:
     PathIterBench(void* param, bool raw) : INHERITED(param) {
         fName.printf("pathiter_%s", raw ? "raw" : "consume");
@@ -67,7 +65,7 @@ protected:
 
     virtual void onDraw(SkCanvas*) SK_OVERRIDE {
         if (fRaw) {
-            for (int i = 0; i < N; ++i) {
+            for (int i = 0; i < this->getLoops(); ++i) {
                 SkPath::RawIter iter(fPath);
                 SkPath::Verb verb;
                 SkPoint      pts[4];
@@ -75,7 +73,7 @@ protected:
                 while ((verb = iter.next(pts)) != SkPath::kDone_Verb) { }
             }
         } else {
-            for (int i = 0; i < N; ++i) {
+            for (int i = 0; i < this->getLoops(); ++i) {
                 SkPath::Iter iter(fPath, false);
                 SkPath::Verb verb;
                 SkPoint      pts[4];