Wire up configurations properly in VisualBench

tools/VisualBench/VisualFlags.h

Index: tools/VisualBench/VisualFlags.h
diff --git a/tools/VisualBench/VisualFlags.h b/tools/VisualBench/VisualFlags.h
index ad3bdea640be2f9e1d4510296028956c92e445c8..16d2a0c00f0728b147251dbd6967c0f5466a3282 100644
--- a/tools/VisualBench/VisualFlags.h
+++ b/tools/VisualBench/VisualFlags.h
@@ -10,8 +10,28 @@
 
 #include "SkCommandLineFlags.h"
 
+struct Configs {
+    struct Config {
+       enum Type {
+           kGpu_Type,
+           kMsaa_Type,
+           kNvpr_Type,
+           kCpu_Type,
+       };
+       Type fType;
+       int fNumSamples;
+
+       SkString humanReadable() const;
+    };
+    SkTArray<Config> fList;
+    int fIter;
+
+    Configs() { fIter = 0; }
+    Config& push_back() { return fList.push_back(); }
+    const Config& current() const { return fList[fIter]; }
+    bool next() { fIter++; return fIter >= fList.count(); }
+};
+
 DECLARE_string(config);
-DECLARE_int32(msaa);
-DECLARE_bool(nvpr);
 
 #endif