Refactoring benchmarks for perf bot efficiency.

tools/perf/perf_tools/scrolling_benchmark.py

Index: tools/perf/perf_tools/scrolling_benchmark.py
diff --git a/tools/perf/perf_tools/scrolling_benchmark.py b/tools/perf/perf_tools/scrolling_benchmark.py
index 736703320cb6299f27323435ef0f4c3923b6e85c..cc3ddad9fdc385ccd589322c20c2d65e03ff1407 100644
--- a/tools/perf/perf_tools/scrolling_benchmark.py
+++ b/tools/perf/perf_tools/scrolling_benchmark.py
@@ -1,93 +1,8 @@
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-from telemetry import multi_page_benchmark
+from perf_tools import smoothness_benchmark
 
-class DidNotScrollException(multi_page_benchmark.MeasurementFailure):
+class ScrollingBenchmark(smoothness_benchmark.SmoothnessBenchmark):
   def __init__(self):
-    super(DidNotScrollException, self).__init__('Page did not scroll')
-
-def GetOrZero(stat, rendering_stats_deltas):
-  if stat in rendering_stats_deltas:
-    return rendering_stats_deltas[stat]
-  return 0
-
-def DivideIfPossibleOrZero(numerator, denominator):
-  if denominator == 0:
-    return 0
-  return numerator / denominator
-
-def CalcScrollResults(rendering_stats_deltas, results):
-  num_frames_sent_to_screen = rendering_stats_deltas['numFramesSentToScreen']
-
-  mean_frame_time_seconds = (
-    rendering_stats_deltas['totalTimeInSeconds'] /
-      float(num_frames_sent_to_screen))
-
-  dropped_percent = (
-    rendering_stats_deltas['droppedFrameCount'] /
-    float(num_frames_sent_to_screen))
-
-
-  totalPaintTime = GetOrZero('totalPaintTimeInSeconds',
-                                   rendering_stats_deltas)
-
-  totalRasterizeTime = GetOrZero('totalRasterizeTimeInSeconds',
-                                       rendering_stats_deltas)
-
-  totalPixelsPainted = GetOrZero('totalPixelsPainted',
-                                       rendering_stats_deltas)
-
-  totalPixelsRasterized = GetOrZero('totalPixelsRasterized',
-                                          rendering_stats_deltas)
-
-
-  megapixelsPaintedPerSecond = DivideIfPossibleOrZero(
-      (totalPixelsPainted / 1000000.0), totalPaintTime)
-
-  megapixelsRasterizedPerSecond = DivideIfPossibleOrZero(
-      (totalPixelsRasterized / 1000000.0), totalRasterizeTime)
-
-  results.Add('mean_frame_time', 'ms', round(mean_frame_time_seconds * 1000, 3))
-  results.Add('dropped_percent', '%', round(dropped_percent * 100, 1))
-
-  results.Add('total_paint_time', 'seconds', totalPaintTime)
-  results.Add('total_rasterize_time', 'seconds', totalRasterizeTime)
-  results.Add('total_pixels_painted', '', totalPixelsPainted)
-  results.Add('total_pixels_rasterized', '', totalPixelsRasterized)
-  results.Add('megapixels_painted_per_second', '', megapixelsPaintedPerSecond)
-  results.Add('megapixels_rasterized_per_second', '',
-              megapixelsRasterizedPerSecond)
-  results.Add('total_paint_and_rasterize_time', 'seconds', totalPaintTime +
-              totalRasterizeTime)
-
-class ScrollingBenchmark(multi_page_benchmark.MultiPageBenchmark):
-  def __init__(self):
-    super(ScrollingBenchmark, self).__init__('scrolling')
-
-  def AddCommandLineOptions(self, parser):
-    parser.add_option('--no-gpu-benchmarking-extension', action='store_true',
-        dest='no_gpu_benchmarking_extension',
-        help='Disable the chrome.gpuBenchmarking extension.')
-    parser.add_option('--report-all-results', dest='report_all_results',
-                      action='store_true',
-                      help='Reports all data collected, not just FPS')
-
-  def CustomizeBrowserOptions(self, options):
-    if not options.no_gpu_benchmarking_extension:
-      options.extra_browser_args.append('--enable-gpu-benchmarking')
-
-  def CanRunForPage(self, page):
-    return hasattr(page, 'scrolling')
-
-  def MeasurePage(self, page, tab, results):
-    rendering_stats_deltas = tab.runtime.Evaluate(
-      'window.__renderingStatsDeltas')
-
-    if not (rendering_stats_deltas['numFramesSentToScreen'] > 0):
-      raise DidNotScrollException()
-
-    CalcScrollResults(rendering_stats_deltas, results)
-    if self.options.report_all_results:
-      for k, v in rendering_stats_deltas.iteritems():
-        results.Add(k, '', v)
+    super(ScrollingBenchmark, self).__init__()