Add NVPR to VisualBench

tools/VisualBench/VisualBenchmarkStream.cpp

Index: tools/VisualBench/VisualBenchmarkStream.cpp
diff --git a/tools/VisualBench/VisualBenchmarkStream.cpp b/tools/VisualBench/VisualBenchmarkStream.cpp
index 235200a761295a69e9e8f84478eba33a5941e25f..906aab27886d44d9fbbaaf6bb6954595b3c33e6d 100644
--- a/tools/VisualBench/VisualBenchmarkStream.cpp
+++ b/tools/VisualBench/VisualBenchmarkStream.cpp
@@ -7,13 +7,14 @@
  */
 
 #include <VisualBench/VisualBenchmarkStream.h>
-#include "CpuWrappedBenchmark.h"
+#include <VisualBench/WrappedBenchmark.h>
 #include "GMBench.h"
 #include "SkOSFile.h"
 #include "SkPath.h"
 #include "SkPictureRecorder.h"
 #include "SkStream.h"
 #include "sk_tool_utils.h"
+#include "VisualFlags.h"
 #include "VisualSKPBench.h"
 
 DEFINE_bool(cpu, false, "Run in CPU mode?");
@@ -115,8 +116,12 @@ Benchmark* VisualBenchmarkStream::next() {
             bench->unref();
         }
     }
+
+    // TODO move this all to --config
     if (bench && FLAGS_cpu) {
         bench = new CpuWrappedBenchmark(bench);
+    } else if (bench && FLAGS_nvpr) {
+        bench = new NvprWrappedBenchmark(bench, 4);
     }
 
     fBenchmark.reset(bench);