[telemetry] Cleanups for benchmarks importing page sets.

tools/perf/benchmarks/chrome_proxy.py

Index: tools/perf/benchmarks/chrome_proxy.py
diff --git a/tools/perf/benchmarks/chrome_proxy.py b/tools/perf/benchmarks/chrome_proxy.py
index 4414d24a970ccf9e0adf1bb60dcb39c242752406..9e792990f8e09dce85bfe4a5c6b8fbd5e9012efb 100644
--- a/tools/perf/benchmarks/chrome_proxy.py
+++ b/tools/perf/benchmarks/chrome_proxy.py
@@ -3,18 +3,15 @@
 # found in the LICENSE file.
 
 from telemetry import test
+
 from measurements import chrome_proxy
-from page_sets.chrome_proxy import bypass
-from page_sets.chrome_proxy import fallback_viaheader
-from page_sets.chrome_proxy import safebrowsing
-from page_sets.chrome_proxy import smoke
-from page_sets.chrome_proxy import synthetic
-from page_sets.chrome_proxy import top_20
+import page_sets
+
 
 class ChromeProxyLatency(test.Test):
   tag = 'latency'
   test = chrome_proxy.ChromeProxyLatency
-  page_set = top_20.Top20PageSet()
+  page_set = page_sets.Top20PageSet
   options = {'pageset_repeat_iters': 2}
 
   def CustomizeBrowserOptions(self, options):
@@ -24,22 +21,22 @@ class ChromeProxyLatency(test.Test):
 class ChromeProxyLatencyDirect(test.Test):
   tag = 'latency_direct'
   test = chrome_proxy.ChromeProxyLatency
-  page_set = top_20.Top20PageSet()
+  page_set = page_sets.Top20PageSet
   options = {'pageset_repeat_iters': 2}
 
 
 class ChromeProxyLatencySynthetic(ChromeProxyLatency):
-  page_set = synthetic.SyntheticPageSet()
+  page_set = page_sets.SyntheticPageSet
 
 
 class ChromeProxyLatencySyntheticDirect(ChromeProxyLatencyDirect):
-  page_set = synthetic.SyntheticPageSet()
+  page_set = page_sets.SyntheticPageSet
 
 
 class ChromeProxyDataSaving(test.Test):
   tag = 'data_saving'
   test = chrome_proxy.ChromeProxyDataSaving
-  page_set = top_20.Top20PageSet()
+  page_set = page_sets.Top20PageSet
   options = {'pageset_repeat_iters': 1}
   def CustomizeBrowserOptions(self, options):
     options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth')
@@ -48,49 +45,49 @@ class ChromeProxyDataSaving(test.Test):
 class ChromeProxyDataSavingDirect(test.Test):
   tag = 'data_saving_direct'
   test = chrome_proxy.ChromeProxyDataSaving
+  page_set = page_sets.Top20PageSet
   options = {'pageset_repeat_iters': 2}
-  page_set = top_20.Top20PageSet()
 
 
 class ChromeProxyDataSavingSynthetic(ChromeProxyDataSaving):
-  page_set = synthetic.SyntheticPageSet()
+  page_set = page_sets.SyntheticPageSet
 
 
 class ChromeProxyDataSavingSyntheticDirect(ChromeProxyDataSavingDirect):
-  page_set = synthetic.SyntheticPageSet()
+  page_set = page_sets.SyntheticPageSet
 
 
 class ChromeProxyHeaderValidation(test.Test):
   tag = 'header_validation'
   test = chrome_proxy.ChromeProxyHeaders
-  page_set = top_20.Top20PageSet()
+  page_set = page_sets.Top20PageSet
 
 
 class ChromeProxyBypass(test.Test):
   tag = 'bypass'
   test = chrome_proxy.ChromeProxyBypass
-  page_set = bypass.BypassPageSet()
+  page_set = page_sets.BypassPageSet
 
 
 class ChromeProxySafeBrowsing(test.Test):
   tag = 'safebrowsing'
   test = chrome_proxy.ChromeProxySafebrowsing
-  page_set = safebrowsing.SafebrowsingPageSet()
+  page_set = page_sets.SafebrowsingPageSet
 
 
 class ChromeProxyHTTPFallbackProbeURL(test.Test):
   tag = 'fallback-probe'
   test = chrome_proxy.ChromeProxyHTTPFallbackProbeURL
-  page_set = synthetic.SyntheticPageSet()
+  page_set = page_sets.SyntheticPageSet
 
 
 class ChromeProxyHTTPFallbackViaHeader(test.Test):
   tag = 'fallback-viaheader'
   test = chrome_proxy.ChromeProxyHTTPFallbackViaHeader
-  page_set = fallback_viaheader.FallbackViaHeaderPageSet()
+  page_set = page_sets.FallbackViaHeaderPageSet
 
 
 class ChromeProxySmoke(test.Test):
   tag = 'smoke'
   test = chrome_proxy.ChromeProxySmoke
-  page_set = smoke.SmokePageSet()
+  page_set = page_sets.SmokePageSet