Use iframe in blink_perf.pywebsocket perf tests to remove --disable-web-security

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 path_util
 from core import perf_benchmark
 
 from telemetry import benchmark
@@ skipping 107 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.platform.StartLocalServer(pywebsocket_server.PywebsocketServer())
 
 
 class BlinkPerfBindings(perf_benchmark.PerfBenchmark):
   tag = 'bindings'
@@ skipping 187 matching lines @@
 # Disabled on reference builds due to https://crbug.com/530374
 @benchmark.Disabled('win', 'chromeos', 'reference')
 class BlinkPerfPywebsocket(perf_benchmark.PerfBenchmark):
   '''
   The blink_perf.pywebsocket tests measure turn-around-time of 10MB
   send/receive for XHR, Fetch API and WebSocket.
   We might ignore <10% regressions, because the tests are noisy and such
   regressions are often unreproducible (https://crbug.com/549017).
   '''
   tag = 'pywebsocket'
-  test = _BlinkPerfPywebsocketMeasurement
+  test = _BlinkPerfMeasurement
 
   @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)
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     return cls.IsSvelte(possible_browser)  # http://crbug.com/551950