| Index: tools/perf/benchmarks/rasterize_and_record_micro.py
 | 
| diff --git a/tools/perf/benchmarks/rasterize_and_record_micro.py b/tools/perf/benchmarks/rasterize_and_record_micro.py
 | 
| index dde1b666a66585bb744b39e3826f0a7ba5542c49..dad5c357af7ef458e27644d988496e952afd0867 100644
 | 
| --- a/tools/perf/benchmarks/rasterize_and_record_micro.py
 | 
| +++ b/tools/perf/benchmarks/rasterize_and_record_micro.py
 | 
| @@ -7,39 +7,63 @@ import page_sets
 | 
|  from telemetry import benchmark
 | 
|  
 | 
|  
 | 
| +class _RasterizeAndRecordMicro(benchmark.Benchmark):
 | 
| +  @classmethod
 | 
| +  def AddBenchmarkCommandLineArgs(cls, parser):
 | 
| +    parser.add_option('--start-wait-time', type='float',
 | 
| +                      default=2,
 | 
| +                      help='Wait time before the benchmark is started '
 | 
| +                      '(must be long enought to load all content)')
 | 
| +    parser.add_option('--rasterize-repeat', type='int',
 | 
| +                      default=100,
 | 
| +                      help='Repeat each raster this many times. Increase '
 | 
| +                      'this value to reduce variance.')
 | 
| +    parser.add_option('--record-repeat', type='int',
 | 
| +                      default=100,
 | 
| +                      help='Repeat each record this many times. Increase '
 | 
| +                      'this value to reduce variance.')
 | 
| +    parser.add_option('--timeout', type='int',
 | 
| +                      default=120,
 | 
| +                      help='The length of time to wait for the micro '
 | 
| +                      'benchmark to finish, expressed in seconds.')
 | 
| +    parser.add_option('--report-detailed-results',
 | 
| +                      action='store_true',
 | 
| +                      help='Whether to report additional detailed results.')
 | 
| +
 | 
| +  def CreatePageTest(self, options):
 | 
| +    return rasterize_and_record_micro.RasterizeAndRecordMicro(
 | 
| +        options.start_wait_time, options.rasterize_repeat,
 | 
| +        options.record_repeat, options.timeout, options.report_detailed_results)
 | 
| +
 | 
|  # RasterizeAndRecord disabled on mac because of crbug.com/350684.
 | 
|  # RasterizeAndRecord disabled on windows because of crbug.com/338057.
 | 
|  @benchmark.Disabled('mac', 'win')
 | 
| -class RasterizeAndRecordMicroTop25(benchmark.Benchmark):
 | 
| +class RasterizeAndRecordMicroTop25(_RasterizeAndRecordMicro):
 | 
|    """Measures rasterize and record performance on the top 25 web pages.
 | 
|  
 | 
|    http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
 | 
| -  test = rasterize_and_record_micro.RasterizeAndRecordMicro
 | 
|    page_set = page_sets.Top25SmoothPageSet
 | 
|  
 | 
|  
 | 
|  @benchmark.Disabled('mac', 'win')
 | 
| -class RasterizeAndRecordMicroKeyMobileSites(benchmark.Benchmark):
 | 
| +class RasterizeAndRecordMicroKeyMobileSites(_RasterizeAndRecordMicro):
 | 
|    """Measures rasterize and record performance on the key mobile sites.
 | 
|  
 | 
|    http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
 | 
| -  test = rasterize_and_record_micro.RasterizeAndRecordMicro
 | 
|    page_set = page_sets.KeyMobileSitesPageSet
 | 
|  
 | 
|  
 | 
|  @benchmark.Disabled('mac', 'win')
 | 
| -class RasterizeAndRecordMicroKeySilkCases(benchmark.Benchmark):
 | 
| +class RasterizeAndRecordMicroKeySilkCases(_RasterizeAndRecordMicro):
 | 
|    """Measures rasterize and record performance on the silk sites.
 | 
|  
 | 
|    http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
 | 
| -  test = rasterize_and_record_micro.RasterizeAndRecordMicro
 | 
|    page_set = page_sets.KeySilkCasesPageSet
 | 
|  
 | 
|  
 | 
|  @benchmark.Enabled('android')
 | 
| -class RasterizeAndRecordMicroPolymer(benchmark.Benchmark):
 | 
| +class RasterizeAndRecordMicroPolymer(_RasterizeAndRecordMicro):
 | 
|    """Measures rasterize and record performance on the Polymer cases.
 | 
|  
 | 
|    http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
 | 
| -  test = rasterize_and_record_micro.RasterizeAndRecordMicro
 | 
|    page_set = page_sets.PolymerPageSet
 | 
| 
 |