Revert of telemetry: Remove command line args from page test

tools/perf/benchmarks/repaint.py

 # Copyright 2014 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 benchmarks import silk_flags
-from measurements import repaint as repaint_measurement
+from measurements import repaint
 import page_sets
 from telemetry import benchmark
 
 
-class _Repaint(benchmark.Benchmark):
-  @classmethod
-  def AddBenchmarkCommandLineArgs(cls, parser):
-    parser.add_option('--mode', type='string',
-                      default='viewport',
-                      help='Invalidation mode. '
-                      'Supported values: fixed_size, layer, random, viewport.')
-    parser.add_option('--width', type='int',
-                      default=None,
-                      help='Width of invalidations for fixed_size mode.')
-    parser.add_option('--height', type='int',
-                      default=None,
-                      help='Height of invalidations for fixed_size mode.')
-
-  def CreatePageTest(self, options):
-    return repaint_measurement.Repaint(options.mode, options.width,
-                                       options.height)
-
 @benchmark.Enabled('android')
-class RepaintKeyMobileSites(_Repaint):
+class RepaintKeyMobileSites(benchmark.Benchmark):
   """Measures repaint performance on the key mobile sites.
 
   http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
+  test = repaint.Repaint
   page_set = page_sets.KeyMobileSitesPageSet
 
 
 @benchmark.Enabled('android')
-class RepaintGpuRasterizationKeyMobileSites(_Repaint):
+class RepaintGpuRasterizationKeyMobileSites(benchmark.Benchmark):
   """Measures repaint performance on the key mobile sites with forced GPU
   rasterization.
 
   http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
   tag = 'gpu_rasterization'
+  test = repaint.Repaint
   page_set = page_sets.KeyMobileSitesPageSet
   def CustomizeBrowserOptions(self, options):
     silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)