Added two telemetry experiments to measure the latency and data saving when the chrome proxy is bypassed.

BUG=520772

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

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

2 files changed, 40 insertions, 12 deletions

diff --git a/tools/chrome_proxy/live_tests/chrome_proxy_benchmark.py b/tools/chrome_proxy/live_tests/chrome_proxy_benchmark.py
index 1f1814f..a9a34ff 100644
--- a/tools/chrome_proxy/live_tests/chrome_proxy_benchmark.py
+++ b/tools/chrome_proxy/live_tests/chrome_proxy_benchmark.py
@@ -19,7 +19,7 @@ class ChromeProxyLatency(benchmark.Benchmark):
 
 class ChromeProxyLatencyDirect(benchmark.Benchmark):
   tag = 'latency_direct'
-  test = measurements.ChromeProxyLatency
+  test = measurements.ChromeProxyLatencyDirect
   page_set = pagesets.Top20StorySet
 
   @classmethod
@@ -39,7 +39,7 @@ class ChromeProxyDataSaving(benchmark.Benchmark):
 
 class ChromeProxyDataSavingDirect(benchmark.Benchmark):
   tag = 'data_saving_direct'
-  test = measurements.ChromeProxyDataSaving
+  test = measurements.ChromeProxyDataSavingDirect
   page_set = pagesets.Top20StorySet
 
   @classmethod
diff --git a/tools/chrome_proxy/live_tests/chrome_proxy_measurements.py b/tools/chrome_proxy/live_tests/chrome_proxy_measurements.py
index 066c26f..6086697 100644
--- a/tools/chrome_proxy/live_tests/chrome_proxy_measurements.py
+++ b/tools/chrome_proxy/live_tests/chrome_proxy_measurements.py
@@ -8,16 +8,13 @@ import chrome_proxy_metrics as metrics
 from telemetry.core import exceptions
 from telemetry.page import page_test
 
-class ChromeProxyLatency(page_test.PageTest):
-  """Chrome proxy latency measurement."""
+class ChromeProxyLatencyBase(page_test.PageTest):
+  """Chrome latency measurement."""
 
   def __init__(self, *args, **kwargs):
-    super(ChromeProxyLatency, self).__init__(*args, **kwargs)
+    super(ChromeProxyLatencyBase, self).__init__(*args, **kwargs)
     self._metrics = metrics.ChromeProxyMetric()
 
-  def CustomizeBrowserOptions(self, options):
-    options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth')
-
   def WillNavigateToPage(self, page, tab):
     tab.ClearCache(force=True)
 
@@ -27,15 +24,29 @@ class ChromeProxyLatency(page_test.PageTest):
     self._metrics.AddResultsForLatency(tab, results)
 
 
-class ChromeProxyDataSaving(page_test.PageTest):
-  """Chrome proxy data saving measurement."""
+class ChromeProxyLatency(ChromeProxyLatencyBase):
+  """Chrome proxy latency measurement."""
+
   def __init__(self, *args, **kwargs):
-    super(ChromeProxyDataSaving, self).__init__(*args, **kwargs)
-    self._metrics = metrics.ChromeProxyMetric()
+    super(ChromeProxyLatency, self).__init__(*args, **kwargs)
 
   def CustomizeBrowserOptions(self, options):
     options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth')
 
+
+class ChromeProxyLatencyDirect(ChromeProxyLatencyBase):
+  """Direct connection latency measurement."""
+
+  def __init__(self, *args, **kwargs):
+    super(ChromeProxyLatencyDirect, self).__init__(*args, **kwargs)
+
+
+class ChromeProxyDataSavingBase(page_test.PageTest):
+  """Chrome data saving measurement."""
+  def __init__(self, *args, **kwargs):
+    super(ChromeProxyDataSavingBase, self).__init__(*args, **kwargs)
+    self._metrics = metrics.ChromeProxyMetric()
+
   def WillNavigateToPage(self, page, tab):
     tab.ClearCache(force=True)
     self._metrics.Start(page, tab)
@@ -45,3 +56,20 @@ class ChromeProxyDataSaving(page_test.PageTest):
     tab.WaitForJavaScriptExpression('performance.timing.loadEventStart', 300)
     self._metrics.Stop(page, tab)
     self._metrics.AddResultsForDataSaving(tab, results)
+
+
+class ChromeProxyDataSaving(ChromeProxyDataSavingBase):
+  """Chrome proxy data saving measurement."""
+
+  def __init__(self, *args, **kwargs):
+    super(ChromeProxyDataSaving, self).__init__(*args, **kwargs)
+
+  def CustomizeBrowserOptions(self, options):
+    options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth')
+
+
+class ChromeProxyDataSavingDirect(ChromeProxyDataSavingBase):
+  """Direct connection data saving measurement."""
+
+  def __init__(self, *args, **kwargs):
+    super(ChromeProxyDataSavingDirect, self).__init__(*args, **kwargs)