OLD | NEW |
---|---|
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 from common.chrome_proxy_benchmark import ChromeProxyBenchmark | 5 from common.chrome_proxy_benchmark import ChromeProxyBenchmark |
6 from integration_tests import chrome_proxy_pagesets as pagesets | 6 from integration_tests import chrome_proxy_pagesets as pagesets |
7 from integration_tests import chrome_proxy_measurements as measurements | 7 from integration_tests import chrome_proxy_measurements as measurements |
8 from telemetry import benchmark | 8 from telemetry import benchmark |
9 from telemetry.core.backends.chrome import android_browser_finder | 9 from telemetry.core.backends.chrome import android_browser_finder |
10 | 10 |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
82 @classmethod | 82 @classmethod |
83 def Name(cls): | 83 def Name(cls): |
84 return 'chrome_proxy_benchmark.block_once.block_once' | 84 return 'chrome_proxy_benchmark.block_once.block_once' |
85 | 85 |
86 | 86 |
87 @benchmark.Enabled(*ANDROID_CHROME_BROWSERS) | 87 @benchmark.Enabled(*ANDROID_CHROME_BROWSERS) |
88 # Safebrowsing is enabled for Android and iOS. | 88 # Safebrowsing is enabled for Android and iOS. |
89 class ChromeProxySafeBrowsingOn(ChromeProxyBenchmark): | 89 class ChromeProxySafeBrowsingOn(ChromeProxyBenchmark): |
90 tag = 'safebrowsing_on' | 90 tag = 'safebrowsing_on' |
91 test = measurements.ChromeProxySafebrowsingOn | 91 test = measurements.ChromeProxySafebrowsingOn |
92 page_set = pagesets.SafebrowsingPageSet | 92 |
93 def CreateUserStorySet(self, options): | |
sclittle
2015/05/19 19:58:57
Why is this benchmark being changed to not use |pa
nednguyen
2015/05/19 20:18:01
Because we need to instantiate the pagesets.Safebr
| |
94 del options # unused | |
95 return pagesets.SafebrowsingPageSet(expect_timeout=True) | |
93 | 96 |
94 @classmethod | 97 @classmethod |
95 def Name(cls): | 98 def Name(cls): |
96 return 'chrome_proxy_benchmark.safebrowsing_on.safebrowsing' | 99 return 'chrome_proxy_benchmark.safebrowsing_on.safebrowsing' |
97 | 100 |
98 | 101 |
99 @benchmark.Disabled(*ANDROID_CHROME_BROWSERS) | 102 @benchmark.Disabled(*ANDROID_CHROME_BROWSERS) |
100 # Safebrowsing is switched off for Android Webview and all desktop platforms. | 103 # Safebrowsing is switched off for Android Webview and all desktop platforms. |
101 class ChromeProxySafeBrowsingOff(ChromeProxyBenchmark): | 104 class ChromeProxySafeBrowsingOff(ChromeProxyBenchmark): |
102 tag = 'safebrowsing_off' | 105 tag = 'safebrowsing_off' |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
149 | 152 |
150 | 153 |
151 class ChromeProxySmoke(ChromeProxyBenchmark): | 154 class ChromeProxySmoke(ChromeProxyBenchmark): |
152 tag = 'smoke' | 155 tag = 'smoke' |
153 test = measurements.ChromeProxySmoke | 156 test = measurements.ChromeProxySmoke |
154 page_set = pagesets.SmokePageSet | 157 page_set = pagesets.SmokePageSet |
155 | 158 |
156 @classmethod | 159 @classmethod |
157 def Name(cls): | 160 def Name(cls): |
158 return 'chrome_proxy_benchmark.smoke.smoke' | 161 return 'chrome_proxy_benchmark.smoke.smoke' |
OLD | NEW |