Major bench refactoring.

bench/RectoriBench.cpp

Index: bench/RectoriBench.cpp
diff --git a/bench/RectoriBench.cpp b/bench/RectoriBench.cpp
index bb887971c12bf06d72723b6546fc06d12067e31c..0a0b71dac6a4b95bc50754ba06e88788a14be239 100644
--- a/bench/RectoriBench.cpp
+++ b/bench/RectoriBench.cpp
@@ -27,7 +27,7 @@ protected:
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkRandom Random;
 
-        for (int i = 0; i < N; i++) {
+        for (int i = 0; i < this->getLoops(); i++) {
             SkScalar blurSigma = Random.nextRangeScalar(1.5f, 25.0f);
             SkScalar size = Random.nextRangeScalar(20*blurSigma, 50*blurSigma);
 
@@ -70,8 +70,6 @@ private:
         H = 480,
     };
 
-    enum { N = SkBENCHLOOP(100) };
-
     SkLayerDrawLooper* createLooper(SkScalar xOff, SkScalar sigma) {
         SkLayerDrawLooper* looper = new SkLayerDrawLooper;