| 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 80e034e2a8df1ae7a43bc12b5019011ad69ecf28..903b574afb265bc4b8437b9261cefb33a47c6377 100644
|
| --- a/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py
|
| +++ b/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py
|
| @@ -42,6 +42,7 @@ class ChromeProxyDataSaving(benchmark.Benchmark):
|
| test = measurements.ChromeProxyDataSaving
|
| page_set = pagesets.Top20PageSet
|
| options = {'pageset_repeat_iters': 1}
|
| +
|
| def CustomizeBrowserOptions(self, options):
|
| options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth')
|
|
|
| @@ -70,24 +71,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'
|
| @@ -124,6 +136,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
|
|
|