| Index: tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py
|
| diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py b/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py
|
| index 4ef8303f39fea12eff2d4b1667f2ff3e6cb5cdf2..6275eccd06b14e8b7a544fb1c4d130fbef8d90c8 100644
|
| --- a/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py
|
| +++ b/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py
|
| @@ -39,6 +39,7 @@ class ChromeProxyDataSaving(benchmark.Benchmark):
|
| tag = 'data_saving'
|
| test = measurements.ChromeProxyDataSaving
|
| page_set = pagesets.Top20PageSet
|
| +
|
| def CustomizeBrowserOptions(self, options):
|
| options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth')
|
|
|
| @@ -66,24 +67,35 @@ class ChromeProxyHeaderValidation(benchmark.Benchmark):
|
| test = measurements.ChromeProxyHeaders
|
| page_set = pagesets.Top20PageSet
|
|
|
| +
|
| @benchmark.Enabled('android')
|
| class ChromeProxyClientVersion(benchmark.Benchmark):
|
| tag = 'client_version'
|
| test = measurements.ChromeProxyClientVersion
|
| page_set = pagesets.SyntheticPageSet
|
|
|
| +
|
| @benchmark.Enabled('android')
|
| class ChromeProxyBypass(benchmark.Benchmark):
|
| tag = 'bypass'
|
| test = measurements.ChromeProxyBypass
|
| page_set = pagesets.BypassPageSet
|
|
|
| +
|
| +@benchmark.Enabled('android')
|
| +class ChromeProxyFallback(benchmark.Benchmark):
|
| + tag = 'fallback'
|
| + test = measurements.ChromeProxyFallback
|
| + page_set = pagesets.FallbackPageSet
|
| +
|
| +
|
| @benchmark.Enabled('android')
|
| class ChromeProxyCorsBypass(benchmark.Benchmark):
|
| tag = 'bypass'
|
| test = measurements.ChromeProxyCorsBypass
|
| page_set = pagesets.CorsBypassPageSet
|
|
|
| +
|
| @benchmark.Enabled('android')
|
| class ChromeProxyBlockOnce(benchmark.Benchmark):
|
| tag = 'block_once'
|
| @@ -120,6 +132,13 @@ class ChromeProxyHTTPToDirectFallback(benchmark.Benchmark):
|
|
|
|
|
| @benchmark.Enabled('android')
|
| +class ChromeProxyExplicitBypass(benchmark.Benchmark):
|
| + tag = 'explicit-bypass'
|
| + test = measurements.ChromeProxyExplicitBypass
|
| + page_set = pagesets.ExplicitBypassPageSet
|
| +
|
| +
|
| +@benchmark.Enabled('android')
|
| class ChromeProxySmoke(benchmark.Benchmark):
|
| tag = 'smoke'
|
| test = measurements.ChromeProxySmoke
|
|
|