Revert of small tidy of benchmarkstream

tools/VisualBench/VisualStreamTimingModule.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef VisualStreamTimingModule_DEFINED
 #define VisualStreamTimingModule_DEFINED
 
@@ skipping 13 matching lines @@
 public:
     VisualStreamTimingModule(VisualBench* owner, bool preWarmBeforeSample);
     void draw(SkCanvas* canvas) override;
 
 private:
     virtual void renderFrame(SkCanvas*, Benchmark*, int loops)=0;
 
     // subclasses should return true to advance the stream
     virtual bool timingFinished(Benchmark*, int loops, double measurement)=0;
 
+    bool nextBenchmarkIfNecessary(SkCanvas*);
+
     TimingStateMachine fTSM;
     SkAutoTDelete<VisualBenchmarkStream> fBenchmarkStream;
+    SkAutoTUnref<Benchmark> fBenchmark;
     bool fReinitializeBenchmark;
     bool fPreWarmBeforeSample;
 
     // support framework
     VisualBench* fOwner;
 
     typedef VisualModule INHERITED;
 };
 
 #endif