Integration tests for desktop platforms and safebrowsing

tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from integration_tests import chrome_proxy_measurements as measurements
 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
   page_set = pagesets.Top20PageSet
 
   @classmethod
   def Name(cls):
     return 'chrome_proxy_benchmark.latency.top_20'
 
   def CustomizeBrowserOptions(self, options):
     options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth')
 
 
-@benchmark.Enabled('android')
 class ChromeProxyLatencyDirect(benchmark.Benchmark):
   tag = 'latency_direct'
   test = measurements.ChromeProxyLatency
   page_set = pagesets.Top20PageSet
 
   @classmethod
   def Name(cls):
     return 'chrome_proxy_benchmark.latency_direct.top_20'
 
 
-@benchmark.Enabled('android')
 class ChromeProxyLatencySynthetic(ChromeProxyLatency):
   page_set = pagesets.SyntheticPageSet
 
   @classmethod
   def Name(cls):
     return 'chrome_proxy_benchmark.latency.synthetic'
 
 
-@benchmark.Enabled('android')
 class ChromeProxyLatencySyntheticDirect(ChromeProxyLatencyDirect):
   page_set = pagesets.SyntheticPageSet
 
   @classmethod
   def Name(cls):
     return 'chrome_proxy_benchmark.latency_direct.synthetic'
 
 
-@benchmark.Enabled('android')
 class ChromeProxyDataSaving(benchmark.Benchmark):
   tag = 'data_saving'
   test = measurements.ChromeProxyDataSaving
   page_set = pagesets.Top20PageSet
 
   @classmethod
   def Name(cls):
     return 'chrome_proxy_benchmark.data_saving.top_20'
 
   def CustomizeBrowserOptions(self, options):
     options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth')
 
 
-@benchmark.Enabled('android')
 class ChromeProxyDataSavingDirect(benchmark.Benchmark):
   tag = 'data_saving_direct'
   test = measurements.ChromeProxyDataSaving
   page_set = pagesets.Top20PageSet
 
   @classmethod
   def Name(cls):
     return 'chrome_proxy_benchmark.data_saving_direct.top_20'
 
 
-@benchmark.Enabled('android')
 class ChromeProxyDataSavingSynthetic(ChromeProxyDataSaving):
   page_set = pagesets.SyntheticPageSet
 
   @classmethod
   def Name(cls):
     return 'chrome_proxy_benchmark.data_saving.synthetic'
 
 
-@benchmark.Enabled('android')
 class ChromeProxyDataSavingSyntheticDirect(ChromeProxyDataSavingDirect):
   page_set = pagesets.SyntheticPageSet
 
   @classmethod
   def Name(cls):
     return 'chrome_proxy_benchmark.data_saving_direct.synthetic'
 
 
-@benchmark.Enabled('android')
 class ChromeProxyHeaderValidation(benchmark.Benchmark):
   tag = 'header_validation'
   test = measurements.ChromeProxyHeaders
   page_set = pagesets.Top20PageSet
 
   @classmethod
   def Name(cls):
     return 'chrome_proxy_benchmark.header_validation.top_20'
 
 
-@benchmark.Enabled('android')
 class ChromeProxyClientVersion(benchmark.Benchmark):
   tag = 'client_version'
   test = measurements.ChromeProxyClientVersion
   page_set = pagesets.SyntheticPageSet
 
   @classmethod
   def Name(cls):
     return 'chrome_proxy_benchmark.client_version.synthetic'
 
 
-@benchmark.Enabled('android')
 class ChromeProxyClientType(benchmark.Benchmark):
   tag = 'client_type'
   test = measurements.ChromeProxyClientType
   page_set = pagesets.ClientTypePageSet
 
   @classmethod
   def Name(cls):
     return 'chrome_proxy_benchmark.client_type.client_type'
 
 
-@benchmark.Enabled('android')
 class ChromeProxyBypass(benchmark.Benchmark):
   tag = 'bypass'
   test = measurements.ChromeProxyBypass
   page_set = pagesets.BypassPageSet
 
   @classmethod
   def Name(cls):
     return 'chrome_proxy_benchmark.bypass.bypass'
 
 
-@benchmark.Enabled('android')
 class ChromeProxyCorsBypass(benchmark.Benchmark):
   tag = 'bypass'
   test = measurements.ChromeProxyCorsBypass
   page_set = pagesets.CorsBypassPageSet
 
   @classmethod
   def Name(cls):
     return 'chrome_proxy_benchmark.bypass.corsbypass'
 
 
-@benchmark.Enabled('android')
 class ChromeProxyBlockOnce(benchmark.Benchmark):
   tag = 'block_once'
   test = measurements.ChromeProxyBlockOnce
   page_set = pagesets.BlockOncePageSet
 
   @classmethod
   def Name(cls):
     return 'chrome_proxy_benchmark.block_once.block_once'
 
 
 @benchmark.Enabled('android')
-class ChromeProxySafeBrowsing(benchmark.Benchmark):
-  tag = 'safebrowsing'
-  test = measurements.ChromeProxySafebrowsing
+# Safebrowsing is enabled for Android and iOS.
+class ChromeProxySafeBrowsingOn(benchmark.Benchmark):
+  tag = 'safebrowsing_on'
+  test = measurements.ChromeProxySafebrowsingOn
   page_set = pagesets.SafebrowsingPageSet
 
   @classmethod
   def Name(cls):
     return 'chrome_proxy_benchmark.safebrowsing.safebrowsing'

[sclittle, 2015/01/26 18:21:38]

This should be 'safebrowsing_on'

[Not at Google. Contact bengr, 2015/01/26 18:43:01]

Done.

 
 
-@benchmark.Enabled('android')
+@benchmark.Disabled('android')
+# Safebrowsing is switched off for Android Webview and all desktop platforms.
+class ChromeProxySafeBrowsingOff(benchmark.Benchmark):
+  tag = 'safebrowsing_off'
+  test = measurements.ChromeProxySafebrowsingOff
+  page_set = pagesets.SafebrowsingPageSet

[sclittle, 2015/01/26 18:21:38]

This class needs that def Name(cls) method as well, for safebrowsing_off

[Not at Google. Contact bengr, 2015/01/26 18:43:01]

Done.

+
+
 class ChromeProxyHTTPFallbackProbeURL(benchmark.Benchmark):
   tag = 'fallback_probe'
   test = measurements.ChromeProxyHTTPFallbackProbeURL
   page_set = pagesets.SyntheticPageSet
 
   @classmethod
   def Name(cls):
     return 'chrome_proxy_benchmark.fallback_probe.synthetic'
 
 
-@benchmark.Enabled('android')
 class ChromeProxyHTTPFallbackViaHeader(benchmark.Benchmark):
   tag = 'fallback_viaheader'
   test = measurements.ChromeProxyHTTPFallbackViaHeader
   page_set = pagesets.FallbackViaHeaderPageSet
 
   @classmethod
   def Name(cls):
     return 'chrome_proxy_benchmark.fallback_viaheader.fallback_viaheader'
 
 
-@benchmark.Enabled('android')
 class ChromeProxyHTTPToDirectFallback(benchmark.Benchmark):
   tag = 'http_to_direct_fallback'
   test = measurements.ChromeProxyHTTPToDirectFallback
   page_set = pagesets.HTTPToDirectFallbackPageSet
 
   @classmethod
   def Name(cls):
     return ('chrome_proxy_benchmark.http_to_direct_fallback.'
             'http_to_direct_fallback')
 
 
-@benchmark.Enabled('android')
 class ChromeProxyReenableAfterBypass(benchmark.Benchmark):
   tag = 'reenable_after_bypass'
   test = measurements.ChromeProxyReenableAfterBypass
   page_set = pagesets.ReenableAfterBypassPageSet
 
   @classmethod
   def Name(cls):
     return 'chrome_proxy_benchmark.reenable_after_bypass.reenable_after_bypass'
 
 
-@benchmark.Enabled('android')
 class ChromeProxySmoke(benchmark.Benchmark):
   tag = 'smoke'
   test = measurements.ChromeProxySmoke
   page_set = pagesets.SmokePageSet
 
   @classmethod
   def Name(cls):
     return 'chrome_proxy_benchmark.smoke.smoke'