[Pywebsocket PerformanceTests 2/2] Add blink_perf.pywebsocket

tools/perf/benchmarks/blink_perf.py

Index: tools/perf/benchmarks/blink_perf.py
diff --git a/tools/perf/benchmarks/blink_perf.py b/tools/perf/benchmarks/blink_perf.py
index 9e56fde72b212a39e44851ddf9568aeff4cc34eb..61ab769febef3fc3d3352219955c3a013ac250ec 100644
--- a/tools/perf/benchmarks/blink_perf.py
+++ b/tools/perf/benchmarks/blink_perf.py
@@ -98,6 +98,23 @@ class _BlinkPerfMeasurement(page_test.PageTest):
 
     print log
 
+class _BlinkPerfWithPywebsocketMeasurement(_BlinkPerfMeasurement):
+  """Runs a Blink performance test with pywebsocket server."""
+  run_pywebsocket_server = True
+
+  def __init__(self):
+    super(_BlinkPerfWithPywebsocketMeasurement, self).__init__()
+    self.needs_pywebsocket_server = True
+
+  def CustomizeBrowserOptions(self, options):
+    super(_BlinkPerfWithPywebsocketMeasurement, self).CustomizeBrowserOptions(
+        options)
+    # Cross-origin accesses are needed to run benchmarks spanning two servers,
+    # the Telemetry's HTTP server and the pywebsocket server.
+    options.AppendExtraBrowserArgs([
+        '--disable-web-security'
+    ])
+
 
 class _BlinkPerfFullFrameMeasurement(_BlinkPerfMeasurement):
   def __init__(self):
@@ -232,3 +249,12 @@ class BlinkPerfXMLHttpRequest(benchmark.Benchmark):
   def CreatePageSet(self, options):
     path = os.path.join(BLINK_PERF_BASE_DIR, 'XMLHttpRequest')
     return CreatePageSetFromPath(path, SKIPPED_FILE)
+
+
+class BlinkPerfPywebsocket(benchmark.Benchmark):
+  tag = 'pywebsocket'
+  test = _BlinkPerfWithPywebsocketMeasurement
+
+  def CreatePageSet(self, options):
+    path = os.path.join(BLINK_PERF_BASE_DIR, 'Pywebsocket')
+    return CreatePageSetFromPath(path, SKIPPED_FILE)