Move top_20 tests to a separate suite

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 b3d699c36ee9c4725af83c5d02226f466f1e9c1d..39bc4a47a7595270a2ac6e5b82bea97a4f3c28d2 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py
@@ -12,27 +12,10 @@ ANDROID_CHROME_BROWSERS = [
   browser for browser in android_browser_finder.CHROME_PACKAGE_NAMES
     if 'webview' not in browser]
 
-class ChromeProxyLatency(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'
+class ChromeProxyLatencySynthetic(benchmark.Benchmark):
+  tag = 'latency'
   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
@@ -40,7 +23,9 @@ class ChromeProxyLatencySynthetic(ChromeProxyLatency):
     return 'chrome_proxy_benchmark.latency.synthetic'
 
 
-class ChromeProxyLatencySyntheticDirect(ChromeProxyLatencyDirect):
+class ChromeProxyLatencySyntheticDirect(benchmark.Benchmark):
+  tag = 'latency_direct'
+  test = measurements.ChromeProxyLatency
   page_set = pagesets.SyntheticPageSet
 
   @classmethod
@@ -48,27 +33,9 @@ class ChromeProxyLatencySyntheticDirect(ChromeProxyLatencyDirect):
     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
@@ -76,7 +43,9 @@ class ChromeProxyDataSavingSynthetic(ChromeProxyDataSaving):
     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
@@ -84,16 +53,6 @@ class ChromeProxyDataSavingSyntheticDirect(ChromeProxyDataSavingDirect):
     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):