Revert of telemetry: Remove command line args from page test

tools/perf/benchmarks/startup.py

Index: tools/perf/benchmarks/startup.py
diff --git a/tools/perf/benchmarks/startup.py b/tools/perf/benchmarks/startup.py
index 8f61587116cae517757488adf7ca95c7331eab0b..a7a8b7c4256e9a3cfe45c74ced961754c902c08b 100644
--- a/tools/perf/benchmarks/startup.py
+++ b/tools/perf/benchmarks/startup.py
@@ -7,56 +7,60 @@
 from telemetry import benchmark
 
 
-class _StartupCold(benchmark.Benchmark):
-  options = {'pageset_repeat': 5}
-
-  def CreatePageTest(self, options):
-    return startup.Startup(cold=True)
-
-
-class _StartupWarm(benchmark.Benchmark):
-  options = {'pageset_repeat': 20}
-
-  def CreatePageTest(self, options):
-    return startup.Startup(cold=False)
+@benchmark.Enabled('has tabs')
+@benchmark.Disabled('snowleopard') # crbug.com/336913
+class StartupColdBlankPage(benchmark.Benchmark):
+  tag = 'cold'
+  test = startup.Startup
+  page_set = page_sets.BlankPageSet
+  options = {'cold': True,
+             'pageset_repeat': 5}
 
 
 @benchmark.Enabled('has tabs')
-@benchmark.Disabled('snowleopard') # crbug.com/336913
-class StartupColdBlankPage(_StartupCold):
-  tag = 'cold'
+class StartupWarmBlankPage(benchmark.Benchmark):
+  tag = 'warm'
+  test = startup.Startup
   page_set = page_sets.BlankPageSet
-
-
-@benchmark.Enabled('has tabs')
-class StartupWarmBlankPage(_StartupWarm):
-  tag = 'warm'
-  page_set = page_sets.BlankPageSet
+  options = {'warm': True,
+             'pageset_repeat': 20}
 
 
 @benchmark.Disabled  # crbug.com/336913
-class StartupColdTheme(_StartupCold):
+class StartupColdTheme(benchmark.Benchmark):
   tag = 'theme_cold'
+  test = startup.Startup
   page_set = page_sets.BlankPageSet
   generated_profile_archive = 'theme_profile.zip'
+  options = {'cold': True,
+             'pageset_repeat': 5}
 
 
 @benchmark.Disabled
-class StartupWarmTheme(_StartupWarm):
+class StartupWarmTheme(benchmark.Benchmark):
   tag = 'theme_warm'
+  test = startup.Startup
   page_set = page_sets.BlankPageSet
   generated_profile_archive = 'theme_profile.zip'
+  options = {'warm': True,
+             'pageset_repeat': 20}
 
 
 @benchmark.Disabled  # crbug.com/336913
-class StartupColdManyExtensions(_StartupCold):
+class StartupColdManyExtensions(benchmark.Benchmark):
   tag = 'many_extensions_cold'
+  test = startup.Startup
   page_set = page_sets.BlankPageSet
   generated_profile_archive = 'many_extensions_profile.zip'
+  options = {'cold': True,
+             'pageset_repeat': 5}
 
 
 @benchmark.Disabled
-class StartupWarmManyExtensions(_StartupWarm):
+class StartupWarmManyExtensions(benchmark.Benchmark):
   tag = 'many_extensions_warm'
+  test = startup.Startup
   page_set = page_sets.BlankPageSet
   generated_profile_archive = 'many_extensions_profile.zip'
+  options = {'warm': True,
+             'pageset_repeat': 20}