Basic CPU support for VisualBench.

tools/VisualBench/VisualBenchmarkStream.cpp

Index: tools/VisualBench/VisualBenchmarkStream.cpp
diff --git a/tools/VisualBench/VisualBenchmarkStream.cpp b/tools/VisualBench/VisualBenchmarkStream.cpp
index 4cc819ded5e0f252ae2df288f04023f04ffec4e8..9e1ce36fbc12ec189a101ba832b3ee0288c7c76f 100644
--- a/tools/VisualBench/VisualBenchmarkStream.cpp
+++ b/tools/VisualBench/VisualBenchmarkStream.cpp
@@ -7,12 +7,14 @@
  */
 
 #include <VisualBench/VisualBenchmarkStream.h>
+#include "CpuWrappedBenchmark.h"
 #include "GMBench.h"
 #include "SkOSFile.h"
 #include "SkPictureRecorder.h"
 #include "SkStream.h"
 #include "VisualSKPBench.h"
 
+DEFINE_bool(cpu, false, "Run in CPU mode?");
 DEFINE_string2(match, m, nullptr,
                "[~][^]substring[$] [...] of bench name to run.\n"
                "Multiple matches may be separated by spaces.\n"
@@ -72,6 +74,9 @@ Benchmark* VisualBenchmarkStream::next() {
             !bench->isSuitableFor(Benchmark::kGPU_Backend))) {
         bench->unref();
     }
+    if (FLAGS_cpu) {
+        return new CpuWrappedBenchmark(bench);
+    }
     return bench;
 }