Major bench refactoring.

bench/MutexBench.cpp

Index: bench/MutexBench.cpp
diff --git a/bench/MutexBench.cpp b/bench/MutexBench.cpp
index d96f3f6600d98e6deada9ea4a48173d4bac4e82c..5a7058d5e02c578b34f809a0df6905178883f9f8 100644
--- a/bench/MutexBench.cpp
+++ b/bench/MutexBench.cpp
@@ -8,10 +8,6 @@
 #include "SkThread.h"
 
 class MutexBench : public SkBenchmark {
-    enum {
-        N = SkBENCHLOOP(80),
-        M = SkBENCHLOOP(200)
-    };
 public:
     MutexBench(void* param) : INHERITED(param) {
         fIsRendering = false;
@@ -22,12 +18,10 @@ protected:
     }
 
     virtual void onDraw(SkCanvas*) {
-        for (int i = 0; i < N; i++) {
-            SK_DECLARE_STATIC_MUTEX(mu);
-            for (int j = 0; j < M; j++) {
-                mu.acquire();
-                mu.release();
-            }
+        SK_DECLARE_STATIC_MUTEX(mu);
+        for (int i = 0; i < this->getLoops(); i++) {
+            mu.acquire();
+            mu.release();
         }
     }