Revert of small tidy of benchmarkstream

tools/VisualBench/VisualBenchmarkStream.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  */
 
 #include <VisualBench/VisualBenchmarkStream.h>
 #include "CpuWrappedBenchmark.h"
@@ skipping 56 matching lines @@
         if (SkStrEndsWith(FLAGS_skps[i], ".skp")) {
             fSKPs.push_back() = FLAGS_skps[i];
         } else {
             SkOSFile::Iter it(FLAGS_skps[i], ".skp");
             SkString path;
             while (it.next(&path)) {
                 fSKPs.push_back() = SkOSPath::Join(FLAGS_skps[0], path.c_str());
             }
         }
     }
-
-    // seed with an initial benchmark
-    this->next();
 }
 
 bool VisualBenchmarkStream::ReadPicture(const char* path, SkAutoTUnref<SkPicture>* pic) {
     // Not strictly necessary, as it will be checked again later,
     // but helps to avoid a lot of pointless work if we're going to skip it.
     if (SkCommandLineFlags::ShouldSkip(FLAGS_match, path)) {
         return false;
     }
 
     SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(path));
     if (stream.get() == nullptr) {
         SkDebugf("Could not read %s.\n", path);
         return false;
     }
 
     pic->reset(SkPicture::CreateFromStream(stream.get()));
     if (pic->get() == nullptr) {
         SkDebugf("Could not read %s as an SkPicture.\n", path);
         return false;
     }
     return true;
 }
 
 Benchmark* VisualBenchmarkStream::next() {
-    Benchmark* bench;
     if (!fIsWarmedUp) {
         fIsWarmedUp = true;
-        bench = new WarmupBench;
-    } else {
-        // skips non matching benches
-        while ((bench = this->innerNext()) &&
-               (SkCommandLineFlags::ShouldSkip(FLAGS_match, bench->getUniqueName()) ||
-                !bench->isSuitableFor(Benchmark::kGPU_Backend))) {
-            bench->unref();
-        }
-    }
-    if (bench && FLAGS_cpu) {
-        bench = new CpuWrappedBenchmark(bench);
+        return new WarmupBench;
     }
 
-    fBenchmark.reset(bench);
-    return fBenchmark;
+    Benchmark* bench;
+
+    // skips non matching benches
+    while ((bench = this->innerNext()) &&
+           (SkCommandLineFlags::ShouldSkip(FLAGS_match, bench->getUniqueName()) ||
+            !bench->isSuitableFor(Benchmark::kGPU_Backend))) {
+        bench->unref();
+    }
+    if (FLAGS_cpu) {
+        return new CpuWrappedBenchmark(bench);
+    }
+    return bench;
 }
 
 Benchmark* VisualBenchmarkStream::innerNext() {
     while (fBenches) {
         Benchmark* bench = fBenches->factory()(nullptr);
         fBenches = fBenches->next();
         if (bench->isVisual()) {
             fSourceType = "bench";
             fBenchType  = "micro";
             return bench;
@@ skipping 20 matching lines @@
         }
 
         SkString name = SkOSPath::Basename(path.c_str());
         fSourceType = "skp";
         fBenchType = "playback";
         return new VisualSKPBench(name.c_str(), pic.get());
     }
 
     return nullptr;
 }