Major bench refactoring.

bench/FontCacheBench.cpp

Index: bench/FontCacheBench.cpp
diff --git a/bench/FontCacheBench.cpp b/bench/FontCacheBench.cpp
index c6aab7a5ba0ef8c941f2d646ea480452ec79b48d..c206d5b6c8966ab8844c407573d5abb9d4e4ceca 100644
--- a/bench/FontCacheBench.cpp
+++ b/bench/FontCacheBench.cpp
@@ -24,10 +24,6 @@ static int count_glyphs(const uint16_t start[]) {
 }
 
 class FontCacheBench : public SkBenchmark {
-    enum {
-        N = SkBENCHLOOP(50)
-    };
-
 public:
     FontCacheBench(void* param) : INHERITED(param) {}
 
@@ -44,7 +40,7 @@ protected:
         const uint16_t* array = gUniqueGlyphIDs;
         while (*array != gUniqueGlyphIDs_Sentinel) {
             size_t count = count_glyphs(array);
-            for (int i = 0; i < N; ++i) {
+            for (int i = 0; i < this->getLoops(); ++i) {
                 paint.measureText(array, count * sizeof(uint16_t));
             }
             array += count + 1;    // skip the sentinel