[Pywebsocket PerformanceTests 2/2] Add blink_perf.pywebsocket

tools/telemetry/telemetry/core/browser.py

Index: tools/telemetry/telemetry/core/browser.py
diff --git a/tools/telemetry/telemetry/core/browser.py b/tools/telemetry/telemetry/core/browser.py
index 85fde0028b4e0c1b8a73704f329bccc34a1f133f..f5071502676eba660ce348c7a9ebdd0668fb68ba 100644
--- a/tools/telemetry/telemetry/core/browser.py
+++ b/tools/telemetry/telemetry/core/browser.py
@@ -11,6 +11,7 @@ from telemetry.core import exceptions
 from telemetry.core import extension_dict
 from telemetry.core import local_server
 from telemetry.core import memory_cache_http_server
+from telemetry.core import pywebsocket_server
 from telemetry.core import tab_list
 from telemetry.core.backends import browser_backend
 
@@ -225,6 +226,11 @@ class Browser(app.App):
     return self._local_server_controller.GetRunningServer(
         memory_cache_http_server.MemoryCacheHTTPServer, None)
 
+  @property
+  def pywebsocket_server(self):
+    return self._local_server_controller.GetRunningServer(
+        pywebsocket_server.PywebsocketServer, None)
+
   def SetHTTPServerDirectories(self, paths):
     """Returns True if the HTTP server was started, False otherwise."""
     if isinstance(paths, basestring):
@@ -254,6 +260,14 @@ class Browser(app.App):
     self.StartLocalServer(server)
     return True
 
+  def StartPywebsocketServer(self):
+    if self.pywebsocket_server:
+      return False
+
+    server = pywebsocket_server.PywebsocketServer()
+    self.StartLocalServer(server)
+    return True
+
   def StartLocalServer(self, server):
     """Starts a LocalServer and associates it with this browser.