Chromium Code Reviews| 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 c54af10f6e854059d30cd4ae2abfaedaa1c8a351..b5c9484c6480445e05702d555b7b930631103156 100644 |
| --- a/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py |
| +++ b/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py |
| @@ -5,8 +5,13 @@ |
| from integration_tests import chrome_proxy_measurements as measurements |
| from integration_tests import chrome_proxy_pagesets as pagesets |
| from telemetry import benchmark |
| +from telemetry.core.backends.chrome import android_browser_finder |
| +ANDROID_CHROME_BROWSERS = [ |
| + browser for browser in android_browser_finder.CHROME_PACKAGE_NAMES\ |
|
sclittle
2015/03/18 17:39:59
Is the backslash necessary? Would it be possible t
bustamante
2015/03/18 18:19:22
Removed, no it's not necessary.
|
| + if 'webview' not in browser] |
| + |
| class ChromeProxyLatency(benchmark.Benchmark): |
| tag = 'latency' |
| test = measurements.ChromeProxyLatency |
| @@ -149,7 +154,7 @@ class ChromeProxyBlockOnce(benchmark.Benchmark): |
| return 'chrome_proxy_benchmark.block_once.block_once' |
| -@benchmark.Enabled('android') |
| +@benchmark.Enabled(*ANDROID_CHROME_BROWSERS) |
| # Safebrowsing is enabled for Android and iOS. |
| class ChromeProxySafeBrowsingOn(benchmark.Benchmark): |
| tag = 'safebrowsing_on' |
| @@ -161,6 +166,7 @@ class ChromeProxySafeBrowsingOn(benchmark.Benchmark): |
| return 'chrome_proxy_benchmark.safebrowsing_on.safebrowsing' |
| +@benchmark.Disabled(*ANDROID_CHROME_BROWSERS) |
| # Safebrowsing is switched off for Android Webview and all desktop platforms. |
| class ChromeProxySafeBrowsingOff(benchmark.Benchmark): |
| tag = 'safebrowsing_off' |