Move top_20 tests to a separate suite

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
 from telemetry.core.backends.chrome import android_browser_finder
 
 
 ANDROID_CHROME_BROWSERS = [
   browser for browser in android_browser_finder.CHROME_PACKAGE_NAMES
     if 'webview' not in browser]
 
-class ChromeProxyLatency(benchmark.Benchmark):
+
+class ChromeProxyLatencySynthetic(benchmark.Benchmark):
   tag = 'latency'
   test = measurements.ChromeProxyLatency
-  page_set = pagesets.Top20PageSet
-
-  @classmethod
-  def Name(cls):
-    return 'chrome_proxy_benchmark.latency.top_20'
-
-
-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'
-
-
-class ChromeProxyLatencySynthetic(ChromeProxyLatency):
   page_set = pagesets.SyntheticPageSet
 
   @classmethod
   def Name(cls):
     return 'chrome_proxy_benchmark.latency.synthetic'
 
 
-class ChromeProxyLatencySyntheticDirect(ChromeProxyLatencyDirect):
+class ChromeProxyLatencySyntheticDirect(benchmark.Benchmark):
+  tag = 'latency_direct'
+  test = measurements.ChromeProxyLatency
   page_set = pagesets.SyntheticPageSet
 
   @classmethod
   def Name(cls):
     return 'chrome_proxy_benchmark.latency_direct.synthetic'
 
 
-class ChromeProxyDataSaving(benchmark.Benchmark):
+class ChromeProxyDataSavingSynthetic(benchmark.Benchmark):
   tag = 'data_saving'
   test = measurements.ChromeProxyDataSaving
-  page_set = pagesets.Top20PageSet
-
-  @classmethod
-  def Name(cls):
-    return 'chrome_proxy_benchmark.data_saving.top_20'
-
-
-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'
-
-
-class ChromeProxyDataSavingSynthetic(ChromeProxyDataSaving):
   page_set = pagesets.SyntheticPageSet
 
   @classmethod
   def Name(cls):
     return 'chrome_proxy_benchmark.data_saving.synthetic'
 
 
-class ChromeProxyDataSavingSyntheticDirect(ChromeProxyDataSavingDirect):
+class ChromeProxyDataSavingSyntheticDirect(benchmark.Benchmark):
+  tag = 'data_saving_direct'
+  test = measurements.ChromeProxyDataSaving
   page_set = pagesets.SyntheticPageSet
 
   @classmethod
   def Name(cls):
     return 'chrome_proxy_benchmark.data_saving_direct.synthetic'
 
 
-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'
-
-
 class ChromeProxyBenchmark(benchmark.Benchmark):
   @classmethod
   def AddCommandLineArgs(cls, parser):
     parser.add_option(
         '--extra-chrome-proxy-via-header',
         type='string', dest="extra_header",
         help='Adds an expected Via header for the Chrome-Proxy tests.')
 
   @classmethod
   def ProcessCommandLineArgs(cls, parser, args):
@@ skipping 136 matching lines @@
 
 
 class ChromeProxySmoke(ChromeProxyBenchmark):
   tag = 'smoke'
   test = measurements.ChromeProxySmoke
   page_set = pagesets.SmokePageSet
 
   @classmethod
   def Name(cls):
     return 'chrome_proxy_benchmark.smoke.smoke'