Integration tests for desktop platforms and safebrowsing

tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py

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 03ca98f144ba8a6d98ed607dc82d34efb676a209..264b4a1bbb1c31768ff36a91606bc8e4fc68ca4e 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py
@@ -7,7 +7,6 @@ from integration_tests import chrome_proxy_pagesets as pagesets
 from telemetry import benchmark
 
 
-@benchmark.Enabled('android')
 class ChromeProxyLatency(benchmark.Benchmark):
   tag = 'latency'
   test = measurements.ChromeProxyLatency
@@ -17,24 +16,20 @@ class ChromeProxyLatency(benchmark.Benchmark):
     options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth')
 
 
-@benchmark.Enabled('android')
 class ChromeProxyLatencyDirect(benchmark.Benchmark):
   tag = 'latency_direct'
   test = measurements.ChromeProxyLatency
   page_set = pagesets.Top20PageSet
 
 
-@benchmark.Enabled('android')
 class ChromeProxyLatencySynthetic(ChromeProxyLatency):
   page_set = pagesets.SyntheticPageSet
 
 
-@benchmark.Enabled('android')
 class ChromeProxyLatencySyntheticDirect(ChromeProxyLatencyDirect):
   page_set = pagesets.SyntheticPageSet
 
 
-@benchmark.Enabled('android')
 class ChromeProxyDataSaving(benchmark.Benchmark):
   tag = 'data_saving'
   test = measurements.ChromeProxyDataSaving
@@ -44,101 +39,91 @@ class ChromeProxyDataSaving(benchmark.Benchmark):
     options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth')
 
 
-@benchmark.Enabled('android')
 class ChromeProxyDataSavingDirect(benchmark.Benchmark):
   tag = 'data_saving_direct'
   test = measurements.ChromeProxyDataSaving
   page_set = pagesets.Top20PageSet
 
 
-@benchmark.Enabled('android')
 class ChromeProxyDataSavingSynthetic(ChromeProxyDataSaving):
   page_set = pagesets.SyntheticPageSet
 
 
-@benchmark.Enabled('android')
 class ChromeProxyDataSavingSyntheticDirect(ChromeProxyDataSavingDirect):
   page_set = pagesets.SyntheticPageSet
 
 
-@benchmark.Enabled('android')
 class ChromeProxyHeaderValidation(benchmark.Benchmark):
   tag = 'header_validation'
   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 ChromeProxyClientType(benchmark.Benchmark):
   tag = 'client_type'
   test = measurements.ChromeProxyClientType
   page_set = pagesets.ClientTypePageSet
 
 
-@benchmark.Enabled('android')
 class ChromeProxyBypass(benchmark.Benchmark):
   tag = 'bypass'
   test = measurements.ChromeProxyBypass
   page_set = pagesets.BypassPageSet
 
 
-@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'
   test = measurements.ChromeProxyBlockOnce
   page_set = pagesets.BlockOncePageSet
 
-
 @benchmark.Enabled('android')

[bengr, 2015/01/23 20:18:19]

sclittle: Which of these tests run with webview?

kundaji: Should some of these be disabled on that platform? If you want to leave
it as is, please list the platforms that are included in mobile and enable the
benchmark on all mobile platforms.

[sclittle, 2015/01/23 22:28:31]

If I remember correctly, the @benchmark.Enabled('android') applies to webview as
well as android chrome. We manually specify which tests should run for each
platform in the jsons for the buildbots.

[Not at Google. Contact bengr, 2015/01/23 22:56:00]

Gave more generic names. Lets deal with webview in another cl since it involves
a different set of files.

-class ChromeProxySafeBrowsing(benchmark.Benchmark):
-  tag = 'safebrowsing'
-  test = measurements.ChromeProxySafebrowsing
+class ChromeProxySafeBrowsingMobile(benchmark.Benchmark):
+  tag = 'safebrowsingmobile'

[bengr, 2015/01/23 20:18:19]

Should we make this 'safebrowsingandroid'? I think we'll wind up having some
tests enabled/disabled on each of our platforms.

[Not at Google. Contact bengr, 2015/01/23 22:56:00]

This test applies to iOS as well. Changed to "On" and "Off" and added comments.

+  test = measurements.ChromeProxySafebrowsingMobile

[bengr, 2015/01/23 20:18:19]

Likewise, "Mobile" or "Android"?

[Not at Google. Contact bengr, 2015/01/23 22:56:00]

Acknowledged.

   page_set = pagesets.SafebrowsingPageSet
 
+@benchmark.Disabled('android')
+class ChromeProxySafeBrowsingDesktop(benchmark.Benchmark):
+  tag = 'safebrowsingdesktop'
+  test = measurements.ChromeProxySafebrowsingDesktop
+  page_set = pagesets.SafebrowsingPageSet
 
-@benchmark.Enabled('android')
 class ChromeProxyHTTPFallbackProbeURL(benchmark.Benchmark):
   tag = 'fallback_probe'
   test = measurements.ChromeProxyHTTPFallbackProbeURL
   page_set = pagesets.SyntheticPageSet
 
 
-@benchmark.Enabled('android')
 class ChromeProxyHTTPFallbackViaHeader(benchmark.Benchmark):
   tag = 'fallback_viaheader'
   test = measurements.ChromeProxyHTTPFallbackViaHeader
   page_set = pagesets.FallbackViaHeaderPageSet
 
 
-@benchmark.Enabled('android')
 class ChromeProxyHTTPToDirectFallback(benchmark.Benchmark):
   tag = 'http_to_direct_fallback'
   test = measurements.ChromeProxyHTTPToDirectFallback
   page_set = pagesets.HTTPToDirectFallbackPageSet
 
 
-@benchmark.Enabled('android')
 class ChromeProxyReenableAfterBypass(benchmark.Benchmark):
   tag = 'reenable_after_bypass'
   test = measurements.ChromeProxyReenableAfterBypass
   page_set = pagesets.ReenableAfterBypassPageSet
 
 
-@benchmark.Enabled('android')
 class ChromeProxySmoke(benchmark.Benchmark):
   tag = 'smoke'
   test = measurements.ChromeProxySmoke