[Telemetry] Make our Enabled/Disabled annotations match what the bots run.

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 a42b2655cda6b7973c86c97340608a185225874b..9fa3ebe0c3a459bc3f402da9c58ae675228c9c8b 100644
--- a/tools/perf/benchmarks/chrome_proxy.py
+++ b/tools/perf/benchmarks/chrome_proxy.py
@@ -2,12 +2,12 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-from telemetry import benchmark
-
 from measurements import chrome_proxy
 import page_sets
+from telemetry import benchmark
 
 
+@benchmark.Disabled
 class ChromeProxyLatency(benchmark.Benchmark):
   tag = 'latency'
   test = chrome_proxy.ChromeProxyLatency
@@ -18,6 +18,7 @@ class ChromeProxyLatency(benchmark.Benchmark):
     options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth')
 
 
+@benchmark.Disabled
 class ChromeProxyLatencyDirect(benchmark.Benchmark):
   tag = 'latency_direct'
   test = chrome_proxy.ChromeProxyLatency
@@ -25,14 +26,17 @@ class ChromeProxyLatencyDirect(benchmark.Benchmark):
   options = {'pageset_repeat_iters': 2}
 
 
+@benchmark.Disabled
 class ChromeProxyLatencySynthetic(ChromeProxyLatency):
   page_set = page_sets.SyntheticPageSet
 
 
+@benchmark.Disabled
 class ChromeProxyLatencySyntheticDirect(ChromeProxyLatencyDirect):
   page_set = page_sets.SyntheticPageSet
 
 
+@benchmark.Disabled
 class ChromeProxyDataSaving(benchmark.Benchmark):
   tag = 'data_saving'
   test = chrome_proxy.ChromeProxyDataSaving
@@ -42,6 +46,7 @@ class ChromeProxyDataSaving(benchmark.Benchmark):
     options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth')
 
 
+@benchmark.Disabled
 class ChromeProxyDataSavingDirect(benchmark.Benchmark):
   tag = 'data_saving_direct'
   test = chrome_proxy.ChromeProxyDataSaving
@@ -49,44 +54,52 @@ class ChromeProxyDataSavingDirect(benchmark.Benchmark):
   options = {'pageset_repeat_iters': 2}
 
 
+@benchmark.Disabled
 class ChromeProxyDataSavingSynthetic(ChromeProxyDataSaving):
   page_set = page_sets.SyntheticPageSet
 
 
+@benchmark.Disabled
 class ChromeProxyDataSavingSyntheticDirect(ChromeProxyDataSavingDirect):
   page_set = page_sets.SyntheticPageSet
 
 
+@benchmark.Disabled
 class ChromeProxyHeaderValidation(benchmark.Benchmark):
   tag = 'header_validation'
   test = chrome_proxy.ChromeProxyHeaders
   page_set = page_sets.Top20PageSet
 
 
+@benchmark.Disabled
 class ChromeProxyBypass(benchmark.Benchmark):
   tag = 'bypass'
   test = chrome_proxy.ChromeProxyBypass
   page_set = page_sets.BypassPageSet
 
 
+@benchmark.Disabled
 class ChromeProxySafeBrowsing(benchmark.Benchmark):
   tag = 'safebrowsing'
   test = chrome_proxy.ChromeProxySafebrowsing
   page_set = page_sets.SafebrowsingPageSet
 
 
+@benchmark.Disabled
 class ChromeProxyHTTPFallbackProbeURL(benchmark.Benchmark):
   tag = 'fallback-probe'
   test = chrome_proxy.ChromeProxyHTTPFallbackProbeURL
   page_set = page_sets.SyntheticPageSet
 
 
+@benchmark.Disabled
 class ChromeProxyHTTPFallbackViaHeader(benchmark.Benchmark):
   tag = 'fallback-viaheader'
   test = chrome_proxy.ChromeProxyHTTPFallbackViaHeader
   page_set = page_sets.FallbackViaHeaderPageSet
 
 
+@benchmark.Disabled
 class ChromeProxySmoke(benchmark.Benchmark):
   tag = 'smoke'
   test = chrome_proxy.ChromeProxySmoke