Rename telemetry.test.Test to telemetry.benchmark.Benchmark.

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 9e792990f8e09dce85bfe4a5c6b8fbd5e9012efb..a42b2655cda6b7973c86c97340608a185225874b 100644
--- a/tools/perf/benchmarks/chrome_proxy.py
+++ b/tools/perf/benchmarks/chrome_proxy.py
@@ -2,13 +2,13 @@
 # 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 telemetry import benchmark
 
 from measurements import chrome_proxy
 import page_sets
 
 
-class ChromeProxyLatency(test.Test):
+class ChromeProxyLatency(benchmark.Benchmark):
   tag = 'latency'
   test = chrome_proxy.ChromeProxyLatency
   page_set = page_sets.Top20PageSet
@@ -18,7 +18,7 @@ class ChromeProxyLatency(test.Test):
     options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth')
 
 
-class ChromeProxyLatencyDirect(test.Test):
+class ChromeProxyLatencyDirect(benchmark.Benchmark):
   tag = 'latency_direct'
   test = chrome_proxy.ChromeProxyLatency
   page_set = page_sets.Top20PageSet
@@ -33,7 +33,7 @@ class ChromeProxyLatencySyntheticDirect(ChromeProxyLatencyDirect):
   page_set = page_sets.SyntheticPageSet
 
 
-class ChromeProxyDataSaving(test.Test):
+class ChromeProxyDataSaving(benchmark.Benchmark):
   tag = 'data_saving'
   test = chrome_proxy.ChromeProxyDataSaving
   page_set = page_sets.Top20PageSet
@@ -42,7 +42,7 @@ class ChromeProxyDataSaving(test.Test):
     options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth')
 
 
-class ChromeProxyDataSavingDirect(test.Test):
+class ChromeProxyDataSavingDirect(benchmark.Benchmark):
   tag = 'data_saving_direct'
   test = chrome_proxy.ChromeProxyDataSaving
   page_set = page_sets.Top20PageSet
@@ -57,37 +57,37 @@ class ChromeProxyDataSavingSyntheticDirect(ChromeProxyDataSavingDirect):
   page_set = page_sets.SyntheticPageSet
 
 
-class ChromeProxyHeaderValidation(test.Test):
+class ChromeProxyHeaderValidation(benchmark.Benchmark):
   tag = 'header_validation'
   test = chrome_proxy.ChromeProxyHeaders
   page_set = page_sets.Top20PageSet
 
 
-class ChromeProxyBypass(test.Test):
+class ChromeProxyBypass(benchmark.Benchmark):
   tag = 'bypass'
   test = chrome_proxy.ChromeProxyBypass
   page_set = page_sets.BypassPageSet
 
 
-class ChromeProxySafeBrowsing(test.Test):
+class ChromeProxySafeBrowsing(benchmark.Benchmark):
   tag = 'safebrowsing'
   test = chrome_proxy.ChromeProxySafebrowsing
   page_set = page_sets.SafebrowsingPageSet
 
 
-class ChromeProxyHTTPFallbackProbeURL(test.Test):
+class ChromeProxyHTTPFallbackProbeURL(benchmark.Benchmark):
   tag = 'fallback-probe'
   test = chrome_proxy.ChromeProxyHTTPFallbackProbeURL
   page_set = page_sets.SyntheticPageSet
 
 
-class ChromeProxyHTTPFallbackViaHeader(test.Test):
+class ChromeProxyHTTPFallbackViaHeader(benchmark.Benchmark):
   tag = 'fallback-viaheader'
   test = chrome_proxy.ChromeProxyHTTPFallbackViaHeader
   page_set = page_sets.FallbackViaHeaderPageSet
 
 
-class ChromeProxySmoke(test.Test):
+class ChromeProxySmoke(benchmark.Benchmark):
   tag = 'smoke'
   test = chrome_proxy.ChromeProxySmoke
   page_set = page_sets.SmokePageSet