Revert of [Pywebsocket PerformanceTests 2/2] Add blink_perf.pywebsocket

tools/perf/benchmarks/blink_perf.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 
 from core import perf_benchmark
 
 from telemetry import benchmark
 from telemetry.core import util
 from telemetry import page as page_module
 from telemetry.page import page_test
 from telemetry.page import shared_page_state
 from telemetry import story
 from telemetry.value import list_of_scalar_values
 
-from benchmarks import pywebsocket_server
 from page_sets import webgl_supported_shared_state
 
 
 BLINK_PERF_BASE_DIR = os.path.join(util.GetChromiumSrcDir(),
                                    'third_party', 'WebKit', 'PerformanceTests')
 SKIPPED_FILE = os.path.join(BLINK_PERF_BASE_DIR, 'Skipped')
 
 
 def CreateStorySetFromPath(path, skipped_file,
                           shared_page_state_class=(
@@ skipping 89 matching lines @@
     self._blink_perf_js += '\nwindow.fullFrameMeasurement = true;'
 
   def CustomizeBrowserOptions(self, options):
     super(_BlinkPerfFullFrameMeasurement, self).CustomizeBrowserOptions(
         options)
     # Full layout measurement needs content_shell with internals testing API.
     assert 'content-shell' in options.browser_type
     options.AppendExtraBrowserArgs(['--expose-internals-for-testing'])
 
 
-class _BlinkPerfPywebsocketMeasurement(_BlinkPerfMeasurement):
-  def CustomizeBrowserOptions(self, options):
-    super(_BlinkPerfPywebsocketMeasurement, 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 _SharedPywebsocketPageState(shared_page_state.SharedPageState):
-  """Runs a pywebsocket server."""
-  def __init__(self, test, finder_options, user_story_set):
-    super(_SharedPywebsocketPageState, self).__init__(
-        test, finder_options, user_story_set)
-    self._pywebsocket_server = pywebsocket_server.PywebsocketServer()
-    self.platform.StartLocalServer(self._pywebsocket_server)
-
-  def TearDownState(self):
-    super(_SharedPywebsocketPageState, self).TearDownState()
-    self._pywebsocket_server.Close()
-
-
 class BlinkPerfBindings(perf_benchmark.PerfBenchmark):
   tag = 'bindings'
   test = _BlinkPerfMeasurement
 
   @classmethod
   def Name(cls):
     return 'blink_perf.bindings'
 
   def CreateStorySet(self, options):
     path = os.path.join(BLINK_PERF_BASE_DIR, 'Bindings')
@@ skipping 158 matching lines @@
   tag = 'xml_http_request'
   test = _BlinkPerfMeasurement
 
   @classmethod
   def Name(cls):
     return 'blink_perf.xml_http_request'
 
   def CreateStorySet(self, options):
     path = os.path.join(BLINK_PERF_BASE_DIR, 'XMLHttpRequest')
     return CreateStorySetFromPath(path, SKIPPED_FILE)
-
-
-# Disabled due to https://crbug.com/521887
-@benchmark.Disabled('win', 'chromeos')
-class BlinkPerfPywebsocket(perf_benchmark.PerfBenchmark):
-  tag = 'pywebsocket'
-  test = _BlinkPerfPywebsocketMeasurement
-
-  @classmethod
-  def Name(cls):
-    return 'blink_perf.pywebsocket'
-
-  def CreateStorySet(self, options):
-    path = os.path.join(BLINK_PERF_BASE_DIR, 'Pywebsocket')
-    return CreateStorySetFromPath(path, SKIPPED_FILE,
-        shared_page_state_class=_SharedPywebsocketPageState)