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 c9961e7718c20978bbf3207b235b2fe48b009528..a05722330915d23136833f0cbce0230d4c48346f 100644 |
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py |
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py |
@@ -6,12 +6,17 @@ 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 |
+from telemetry.core.backends.chrome import cros_browser_finder |
+from telemetry.core.backends.chrome import desktop_browser_finder |
ANDROID_CHROME_BROWSERS = [ |
browser for browser in android_browser_finder.CHROME_PACKAGE_NAMES |
if 'webview' not in browser] |
+DESKTOP_CHROME_BROWSERS = (desktop_browser_finder.FindAllBrowserTypes(None) + |
+ cros_browser_finder.FindAllBrowserTypes(None)) |
+ |
class ChromeProxyLatency(benchmark.Benchmark): |
tag = 'latency' |
test = measurements.ChromeProxyLatency |
@@ -24,7 +29,7 @@ class ChromeProxyLatency(benchmark.Benchmark): |
class ChromeProxyLatencyDirect(benchmark.Benchmark): |
tag = 'latency_direct' |
- test = measurements.ChromeProxyLatency |
+ test = measurements.ChromeProxyLatencyDirect |
page_set = pagesets.Top20PageSet |
@classmethod |
@@ -60,7 +65,7 @@ class ChromeProxyDataSaving(benchmark.Benchmark): |
class ChromeProxyDataSavingDirect(benchmark.Benchmark): |
tag = 'data_saving_direct' |
- test = measurements.ChromeProxyDataSaving |
+ test = measurements.ChromeProxyDataSavingDirect |
page_set = pagesets.Top20PageSet |
@classmethod |
@@ -177,6 +182,7 @@ class ChromeProxySafeBrowsingOff(benchmark.Benchmark): |
def Name(cls): |
return 'chrome_proxy_benchmark.safebrowsing_off.safebrowsing' |
+ |
class ChromeProxyHTTPFallbackProbeURL(benchmark.Benchmark): |
tag = 'fallback_probe' |
test = measurements.ChromeProxyHTTPFallbackProbeURL |
@@ -226,3 +232,40 @@ class ChromeProxySmoke(benchmark.Benchmark): |
@classmethod |
def Name(cls): |
return 'chrome_proxy_benchmark.smoke.smoke' |
+ |
+ |
+@benchmark.Enabled(*DESKTOP_CHROME_BROWSERS) |
+class ChromeProxyVideoDirect(benchmark.Benchmark): |
+ tag = 'video' |
+ test = measurements.ChromeProxyVideoValidation |
+ page_set = pagesets.VideoDirectPageSet |
+ |
+ @classmethod |
+ def Name(cls): |
+ return 'chrome_proxy_benchmark.video.direct' |
+ |
+ |
+@benchmark.Enabled(*DESKTOP_CHROME_BROWSERS) |
+class ChromeProxyVideoProxied(benchmark.Benchmark): |
+ tag = 'video' |
+ test = measurements.ChromeProxyVideoValidation |
+ page_set = pagesets.VideoProxiedPageSet |
+ |
+ @classmethod |
+ def Name(cls): |
+ return 'chrome_proxy_benchmark.video.proxied' |
+ |
+ |
+@benchmark.Enabled(*DESKTOP_CHROME_BROWSERS) |
+class ChromeProxyVideoCompare(benchmark.Benchmark): |
+ """ Runs the ChromeProxyVideoDirect and ChromeProxyVideoProxied benchmarks and |
sclittle
2015/04/11 00:13:02
See style guide for python classdoc style: https:/
Tom Bergan
2015/05/01 23:48:28
Done.
|
+ compares their results. |
+ """ |
+ |
+ tag = 'video' |
+ test = measurements.ChromeProxyVideoValidation |
+ page_set = pagesets.VideoComparePageSet |
+ |
+ @classmethod |
+ def Name(cls): |
+ return 'chrome_proxy_benchmark.video.compare' |