[telemetry] Cleanups for benchmarks importing page sets.

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 078639e3864698f5461dcff0c8978cd388ce0d36..3eea8ad1e4ebfd2294a6137803d28554a3bc0130 100644
--- a/tools/perf/benchmarks/smoothness.py
+++ b/tools/perf/benchmarks/smoothness.py
@@ -2,9 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from telemetry import test
+
 from benchmarks import silk_flags
 from measurements import smoothness
-from telemetry import test
+import page_sets
 
 
 @test.Disabled  # crbug.com/368767
@@ -13,24 +15,24 @@ class SmoothnessTop25(test.Test):
 
   http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
   test = smoothness.Smoothness
-  page_set = 'page_sets/top_25.py'
+  page_set = page_sets.Top25PageSet
 
 
 @test.Disabled('linux', 'mac', 'win')  # crbug.com/368767
 class SmoothnessToughCanvasCases(test.Test):
   test = smoothness.Smoothness
-  page_set = 'page_sets/tough_canvas_cases.py'
+  page_set = page_sets.ToughCanvasCasesPageSet
 
 
 @test.Disabled  # crbug.com/373812
 class SmoothnessToughWebGLCases(test.Test):
   test = smoothness.Smoothness
-  page_set = 'page_sets/tough_webgl_cases.py'
+  page_set = page_sets.ToughWebglCasesPageSet
 
 
 class SmoothnessMaps(test.Test):
   test = smoothness.Smoothness
-  page_set = 'page_sets/maps.py'
+  page_set = page_sets.MapsPageSet
 
 
 class SmoothnessKeyMobileSites(test.Test):
@@ -38,13 +40,13 @@ class SmoothnessKeyMobileSites(test.Test):
 
   http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
   test = smoothness.Smoothness
-  page_set = 'page_sets/key_mobile_sites.py'
+  page_set = page_sets.KeyMobileSitesPageSet
 
 
 @test.Disabled('android', 'mac')  # crbug.com/350692, crbug.com/368767
 class SmoothnessToughAnimationCases(test.Test):
   test = smoothness.Smoothness
-  page_set = 'page_sets/tough_animation_cases.py'
+  page_set = page_sets.ToughAnimationCasesPageSet
 
 
 class SmoothnessKeySilkCases(test.Test):
@@ -52,7 +54,7 @@ class SmoothnessKeySilkCases(test.Test):
   rasterization
   """
   test = smoothness.Smoothness
-  page_set = 'page_sets/key_silk_cases.py'
+  page_set = page_sets.KeySilkCasesPageSet
 
 
 class SmoothnessFastPathKeySilkCases(test.Test):
@@ -61,7 +63,7 @@ class SmoothnessFastPathKeySilkCases(test.Test):
   """
   tag = 'fast_path'
   test = smoothness.Smoothness
-  page_set = 'page_sets/key_silk_cases.py'
+  page_set = page_sets.KeySilkCasesPageSet
   def CustomizeBrowserOptions(self, options):
     silk_flags.CustomizeBrowserOptionsForFastPath(options)
 
@@ -72,7 +74,7 @@ class SmoothnessGpuRasterizationTop25(test.Test):
   """
   tag = 'gpu_rasterization'
   test = smoothness.Smoothness
-  page_set = 'page_sets/top_25.py'
+  page_set = page_sets.Top25PageSet
   def CustomizeBrowserOptions(self, options):
     silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
 
@@ -84,7 +86,7 @@ class SmoothnessGpuRasterizationKeyMobileSites(test.Test):
   """
   tag = 'gpu_rasterization'
   test = smoothness.Smoothness
-  page_set = 'page_sets/key_mobile_sites.py'
+  page_set = page_sets.KeyMobileSitesPageSet
   def CustomizeBrowserOptions(self, options):
     silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
 
@@ -94,7 +96,7 @@ class SmoothnessGpuRasterizationKeySilkCases(test.Test):
   """
   tag = 'gpu_rasterization'
   test = smoothness.Smoothness
-  page_set = 'page_sets/key_silk_cases.py'
+  page_set = page_sets.KeySilkCasesPageSet
   def CustomizeBrowserOptions(self, options):
     silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
 
@@ -106,7 +108,7 @@ class SmoothnessFastPathGpuRasterizationKeySilkCases(
   """
   tag = 'fast_path_gpu_rasterization'
   test = smoothness.Smoothness
-  page_set = 'page_sets/key_silk_cases.py'
+  page_set = page_sets.KeySilkCasesPageSet
   def CustomizeBrowserOptions(self, options):
     super(SmoothnessFastPathGpuRasterizationKeySilkCases, self). \
         CustomizeBrowserOptions(options)
@@ -119,7 +121,7 @@ class SmoothnessToughPinchZoomCases(test.Test):
   cases
   """
   test = smoothness.Smoothness
-  page_set = 'page_sets/tough_pinch_zoom_cases.py'
+  page_set = page_sets.ToughPinchZoomCasesPageSet
 
 
 @test.Disabled  # crbug.com/370725
@@ -127,7 +129,7 @@ class SmoothnessPolymer(test.Test):
   """Measures rendering statistics for Polymer cases.
   """
   test = smoothness.Smoothness
-  page_set = 'page_sets/polymer.py'
+  page_set = page_sets.PolymerPageSet
 
 
 @test.Disabled  # crbug.com/370725
@@ -137,7 +139,7 @@ class SmoothnessFastPathPolymer(test.Test):
   """
   tag = 'fast_path'
   test = smoothness.Smoothness
-  page_set = 'page_sets/polymer.py'
+  page_set = page_sets.PolymerPageSet
   def CustomizeBrowserOptions(self, options):
     silk_flags.CustomizeBrowserOptionsForFastPath(options)
 
@@ -148,7 +150,7 @@ class SmoothnessGpuRasterizationPolymer(test.Test):
   """
   tag = 'gpu_rasterization'
   test = smoothness.Smoothness
-  page_set = 'page_sets/polymer.py'
+  page_set = page_sets.PolymerPageSet
   def CustomizeBrowserOptions(self, options):
     silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
 
@@ -161,7 +163,7 @@ class SmoothnessFastPathGpuRasterizationPolymer(
   """
   tag = 'fast_path_gpu_rasterization'
   test = smoothness.Smoothness
-  page_set = 'page_sets/polymer.py'
+  page_set = page_sets.PolymerPageSet
   def CustomizeBrowserOptions(self, options):
     super(SmoothnessFastPathGpuRasterizationPolymer, self). \
         CustomizeBrowserOptions(options)