CL for perf tryjob on android

tools/perf/benchmarks/smoothness.py

Index: tools/perf/benchmarks/smoothness.py
diff --git a/tools/perf/benchmarks/smoothness.py b/tools/perf/benchmarks/smoothness.py
index eaa16f34bfc7e239d70dbf17150f86f070713e7d..e2d2d279d927d703ad42328260887aa8363f7798 100644
--- a/tools/perf/benchmarks/smoothness.py
+++ b/tools/perf/benchmarks/smoothness.py
@@ -77,9 +77,6 @@ class SmoothnessMaps(benchmark.Benchmark):
   def Name(cls):
     return 'smoothness.maps'
 
-  def CreatePageTest(self, options):  # pylint: disable=unused-argument
-    return smoothness.Smoothness(enable_auto_issuing_marker=False)
-
 
 @benchmark.Disabled('android')
 class SmoothnessKeyDesktopMoveCases(benchmark.Benchmark):
@@ -97,15 +94,13 @@ class SmoothnessKeyMobileSites(benchmark.Benchmark):
 
   http://www.chromium.org/developers/design-documents/rendering-benchmarks
   """
+  test = smoothness.Smoothness
   page_set = page_sets.KeyMobileSitesSmoothPageSet
 
   @classmethod
   def Name(cls):
     return 'smoothness.key_mobile_sites_smooth'
 
-  def CreatePageTest(self, options):  # pylint: disable=unused-argument
-    return smoothness.Smoothness(enable_auto_issuing_marker=False)
-
 
 class SmoothnessToughAnimationCases(benchmark.Benchmark):
   test = smoothness.Smoothness
@@ -121,21 +116,20 @@ class SmoothnessKeySilkCases(benchmark.Benchmark):
   """Measures rendering statistics for the key silk cases without GPU
   rasterization.
   """
+  test = smoothness.Smoothness
   page_set = page_sets.KeySilkCasesPageSet
 
   @classmethod
   def Name(cls):
     return 'smoothness.key_silk_cases'
 
-  def CreatePageTest(self, options):  # pylint: disable=unused-argument
-    return smoothness.Smoothness(enable_auto_issuing_marker=False)
-
 
 @benchmark.Enabled('android')
 class SmoothnessGpuRasterizationTop25(benchmark.Benchmark):
   """Measures rendering statistics for the top 25 with GPU rasterization.
   """
   tag = 'gpu_rasterization'
+  test = smoothness.Smoothness
   page_set = page_sets.Top25SmoothPageSet
 
   def CustomizeBrowserOptions(self, options):
@@ -145,9 +139,6 @@ class SmoothnessGpuRasterizationTop25(benchmark.Benchmark):
   def Name(cls):
     return 'smoothness.gpu_rasterization.top_25_smooth'
 
-  def CreatePageTest(self, options):  # pylint: disable=unused-argument
-    return smoothness.Smoothness(enable_auto_issuing_marker=False)
-
 
 @benchmark.Enabled('android')
 class SmoothnessGpuRasterizationKeyMobileSites(benchmark.Benchmark):
@@ -155,6 +146,7 @@ class SmoothnessGpuRasterizationKeyMobileSites(benchmark.Benchmark):
   rasterization.
   """
   tag = 'gpu_rasterization'
+  test = smoothness.Smoothness
   page_set = page_sets.KeyMobileSitesSmoothPageSet
 
   def CustomizeBrowserOptions(self, options):
@@ -164,9 +156,6 @@ class SmoothnessGpuRasterizationKeyMobileSites(benchmark.Benchmark):
   def Name(cls):
     return 'smoothness.gpu_rasterization.key_mobile_sites_smooth'
 
-  def CreatePageTest(self, options):  # pylint: disable=unused-argument
-    return smoothness.Smoothness(enable_auto_issuing_marker=False)
-
 
 @benchmark.Enabled('android')
 class SmoothnessSyncScrollKeyMobileSites(benchmark.Benchmark):
@@ -174,6 +163,7 @@ class SmoothnessSyncScrollKeyMobileSites(benchmark.Benchmark):
   (main thread) scrolling.
   """
   tag = 'sync_scroll'
+  test = smoothness.Smoothness
   page_set = page_sets.KeyMobileSitesSmoothPageSet
 
   def CustomizeBrowserOptions(self, options):
@@ -183,28 +173,24 @@ class SmoothnessSyncScrollKeyMobileSites(benchmark.Benchmark):
   def Name(cls):
     return 'smoothness.sync_scroll.key_mobile_sites_smooth'
 
-  def CreatePageTest(self, options):  # pylint: disable=unused-argument
-    return smoothness.Smoothness(enable_auto_issuing_marker=False)
-
 
 @benchmark.Enabled('android')
 class SmoothnessSimpleMobilePages(benchmark.Benchmark):
   """Measures rendering statistics for simple mobile sites page set.
   """
+  test = smoothness.Smoothness
   page_set = page_sets.SimpleMobileSitesPageSet
 
   @classmethod
   def Name(cls):
     return 'smoothness.simple_mobile_sites'
 
-  def CreatePageTest(self, options):  # pylint: disable=unused-argument
-    return smoothness.Smoothness(enable_auto_issuing_marker=False)
-
 
 @benchmark.Enabled('android')
 class SmoothnessFlingSimpleMobilePages(benchmark.Benchmark):
   """Measures rendering statistics for flinging a simple mobile sites page set.
   """
+  test = smoothness.Smoothness
   page_set = page_sets.SimpleMobileSitesFlingPageSet
 
   def CustomizeBrowserOptions(self, options):
@@ -217,57 +203,49 @@ class SmoothnessFlingSimpleMobilePages(benchmark.Benchmark):
   def Name(cls):
     return 'smoothness.fling.simple_mobile_sites'
 
-  def CreatePageTest(self, options):  # pylint: disable=unused-argument
-    return smoothness.Smoothness(enable_auto_issuing_marker=False)
-
 
 @benchmark.Enabled('android', 'chromeos')
 class SmoothnessToughPinchZoomCases(benchmark.Benchmark):
   """Measures rendering statistics for pinch-zooming into the tough pinch zoom
   cases.
   """
+  test = smoothness.Smoothness
   page_set = page_sets.ToughPinchZoomCasesPageSet
 
   @classmethod
   def Name(cls):
     return 'smoothness.tough_pinch_zoom_cases'
 
-  def CreatePageTest(self, options):  # pylint: disable=unused-argument
-    return smoothness.Smoothness(enable_auto_issuing_marker=False)
-
 
 @benchmark.Enabled('chromeos')
 class SmoothnessToughScrollingWhileZoomedInCases(benchmark.Benchmark):
   """Measures rendering statistics for pinch-zooming then diagonal scrolling"""
+  test = smoothness.Smoothness
   page_set = page_sets.ToughScrollingWhileZoomedInCasesPageSet
 
   @classmethod
   def Name(cls):
     return 'smoothness.tough_scrolling_while_zoomed_in_cases'
 
-  def CreatePageTest(self, options):  # pylint: disable=unused-argument
-    return smoothness.Smoothness(enable_auto_issuing_marker=False)
-
 
 @benchmark.Enabled('android')
 class SmoothnessPolymer(benchmark.Benchmark):
   """Measures rendering statistics for Polymer cases.
   """
+  test = smoothness.Smoothness
   page_set = page_sets.PolymerPageSet
 
   @classmethod
   def Name(cls):
     return 'smoothness.polymer'
 
-  def CreatePageTest(self, options):  # pylint: disable=unused-argument
-    return smoothness.Smoothness(enable_auto_issuing_marker=False)
-
 
 @benchmark.Enabled('android')
 class SmoothnessGpuRasterizationPolymer(benchmark.Benchmark):
   """Measures rendering statistics for the Polymer cases with GPU rasterization.
   """
   tag = 'gpu_rasterization'
+  test = smoothness.Smoothness
   page_set = page_sets.PolymerPageSet
 
   def CustomizeBrowserOptions(self, options):
@@ -277,9 +255,6 @@ class SmoothnessGpuRasterizationPolymer(benchmark.Benchmark):
   def Name(cls):
     return 'smoothness.gpu_rasterization.polymer'
 
-  def CreatePageTest(self, options):  # pylint: disable=unused-argument
-    return smoothness.Smoothness(enable_auto_issuing_marker=False)
-
 
 class SmoothnessToughFastScrollingCases(benchmark.Benchmark):
   test = smoothness.Smoothness
@@ -327,15 +302,13 @@ class SmoothnessGpuImageDecodingCases(benchmark.Benchmark):
 class SmoothnessPathologicalMobileSites(benchmark.Benchmark):
   """Measures task execution statistics while scrolling pathological sites.
   """
+  test = smoothness.Smoothness
   page_set = page_sets.PathologicalMobileSitesPageSet
 
   @classmethod
   def Name(cls):
     return 'smoothness.pathological_mobile_sites'
 
-  def CreatePageTest(self, options):  # pylint: disable=unused-argument
-    return smoothness.Smoothness(enable_auto_issuing_marker=False)
-
 
 @benchmark.Enabled('android')
 class SmoothnessSyncScrollPathologicalMobileSites(benchmark.Benchmark):
@@ -343,6 +316,7 @@ class SmoothnessSyncScrollPathologicalMobileSites(benchmark.Benchmark):
   """
   tag = 'sync_scroll'
   page_set = page_sets.PathologicalMobileSitesPageSet
+  test = smoothness.Smoothness
 
   def CustomizeBrowserOptions(self, options):
     silk_flags.CustomizeBrowserOptionsForSyncScrolling(options)
@@ -351,9 +325,6 @@ class SmoothnessSyncScrollPathologicalMobileSites(benchmark.Benchmark):
   def Name(cls):
     return 'smoothness.sync_scroll.pathological_mobile_sites'
 
-  def CreatePageTest(self, options):  # pylint: disable=unused-argument
-    return smoothness.Smoothness(enable_auto_issuing_marker=False)
-
 
 class SmoothnessToughAnimatedImageCases(benchmark.Benchmark):
   test = smoothness.Smoothness