Reset chrome_proxy_benchmark tests to original names.

Fixes name changes from https://codereview.chromium.org/816353008/

BUG=451541

Review URL: https://codereview.chromium.org/865403004

Cr-Commit-Position: refs/heads/master@{#312951}

tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py

@@ -13,6 +13,10 @@ class ChromeProxyLatency(benchmark.Benchmark):
   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')
 
@@ -23,16 +27,28 @@ class ChromeProxyLatencyDirect(benchmark.Benchmark):
   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):
@@ -40,6 +56,10 @@ class ChromeProxyDataSaving(benchmark.Benchmark):
   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')
 
@@ -50,16 +70,28 @@ class ChromeProxyDataSavingDirect(benchmark.Benchmark):
   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):
@@ -67,6 +99,10 @@ class ChromeProxyHeaderValidation(benchmark.Benchmark):
   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):
@@ -74,6 +110,10 @@ class ChromeProxyClientVersion(benchmark.Benchmark):
   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):
@@ -81,6 +121,10 @@ class ChromeProxyClientType(benchmark.Benchmark):
   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):
@@ -88,6 +132,10 @@ class ChromeProxyBypass(benchmark.Benchmark):
   test = measurements.ChromeProxyBypass
   page_set = pagesets.BypassPageSet
 
+  @classmethod
+  def Name(cls):
+    return 'chrome_proxy_benchmark.bypass.bypass'
+
 
 @benchmark.Enabled('android')
 class ChromeProxyCorsBypass(benchmark.Benchmark):
@@ -95,6 +143,10 @@ class ChromeProxyCorsBypass(benchmark.Benchmark):
   test = measurements.ChromeProxyCorsBypass
   page_set = pagesets.CorsBypassPageSet
 
+  @classmethod
+  def Name(cls):
+    return 'chrome_proxy_benchmark.bypass.corsbypass'
+
 
 @benchmark.Enabled('android')
 class ChromeProxyBlockOnce(benchmark.Benchmark):
@@ -102,6 +154,10 @@ class ChromeProxyBlockOnce(benchmark.Benchmark):
   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):
@@ -109,6 +165,10 @@ class ChromeProxySafeBrowsing(benchmark.Benchmark):
   test = measurements.ChromeProxySafebrowsing
   page_set = pagesets.SafebrowsingPageSet
 
+  @classmethod
+  def Name(cls):
+    return 'chrome_proxy_benchmark.safebrowsing.safebrowsing'
+
 
 @benchmark.Enabled('android')
 class ChromeProxyHTTPFallbackProbeURL(benchmark.Benchmark):
@@ -116,6 +176,10 @@ class ChromeProxyHTTPFallbackProbeURL(benchmark.Benchmark):
   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):
@@ -123,6 +187,10 @@ class ChromeProxyHTTPFallbackViaHeader(benchmark.Benchmark):
   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):
@@ -130,6 +198,11 @@ class ChromeProxyHTTPToDirectFallback(benchmark.Benchmark):
   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):
@@ -137,9 +210,17 @@ class ChromeProxyReenableAfterBypass(benchmark.Benchmark):
   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'