BASELINE: Update Chromium to 94.0.4606.111

Change-Id: I924781584def20fc800bedf6ff41fdb96c438193
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

3 files changed, 34 insertions, 5 deletions

diff --git a/chromium/third_party/blink/tools/blinkpy/web_tests/servers/apache_http.py b/chromium/third_party/blink/tools/blinkpy/web_tests/servers/apache_http.py
index 8a253dbe4d8..1cdde246b3c 100644
--- a/chromium/third_party/blink/tools/blinkpy/web_tests/servers/apache_http.py
+++ b/chromium/third_party/blink/tools/blinkpy/web_tests/servers/apache_http.py
@@ -173,7 +173,7 @@ class ApacheHTTP(server_base.ServerBase):
 
         if additional_dirs:
             self._start_cmd = start_cmd
-            for alias, path in additional_dirs.iteritems():
+            for alias, path in additional_dirs.items():
                 start_cmd += [
                     '-c',
                     'Alias %s "%s"' % (alias, path),
diff --git a/chromium/third_party/blink/tools/blinkpy/web_tests/servers/cli_wrapper.py b/chromium/third_party/blink/tools/blinkpy/web_tests/servers/cli_wrapper.py
index e37580c1105..470caa82e1f 100644
--- a/chromium/third_party/blink/tools/blinkpy/web_tests/servers/cli_wrapper.py
+++ b/chromium/third_party/blink/tools/blinkpy/web_tests/servers/cli_wrapper.py
@@ -31,6 +31,8 @@ Scripts in tools/ can use this module to start servers that are normally used
 for web tests, outside of the web test runner.
 """
 
+from __future__ import print_function
+
 import logging
 import optparse
 import os
@@ -102,7 +104,7 @@ def main(server_constructor,
     server = server_constructor(port_obj, options.output_dir, **kwargs)
     server.start()
 
-    print 'Press Ctrl-C or `kill {}` to stop the server'.format(os.getpid())
+    print('Press Ctrl-C or `kill {}` to stop the server'.format(os.getpid()))
     try:
         while True:
             sleep_fn()
diff --git a/chromium/third_party/blink/tools/blinkpy/web_tests/servers/wptserve.py b/chromium/third_party/blink/tools/blinkpy/web_tests/servers/wptserve.py
index f069fb2f22a..20ef3d819a3 100644
--- a/chromium/third_party/blink/tools/blinkpy/web_tests/servers/wptserve.py
+++ b/chromium/third_party/blink/tools/blinkpy/web_tests/servers/wptserve.py
@@ -16,11 +16,20 @@ _log = logging.getLogger(__name__)
 class WPTServe(server_base.ServerBase):
     def __init__(self, port_obj, output_dir):
         super(WPTServe, self).__init__(port_obj, output_dir)
+
         # These ports must match wpt_tools/wpt.config.json
-        http_port, http_alt_port, https_port, https_alt_port = (8001, 8081,
-                                                                8444, 8445)
+        http_port = 8001
+        http_alt_port = 8081
+        http_private_port = 8082
+        http_public_port = 8083
+        https_port = 8444
+        https_alt_port = 8445
+        https_private_port = 8446
+        https_public_port = 8447
         h2_port = 9000
-        ws_port, wss_port = (9001, 9444)
+        ws_port = 9001
+        wss_port = 9444
+
         self._name = 'wptserve'
         self._log_prefixes = ('wptserve_stderr', )
         self._mappings = [{
@@ -30,6 +39,12 @@ class WPTServe(server_base.ServerBase):
             'port': http_alt_port,
             'scheme': 'http'
         }, {
+            'port': http_private_port,
+            'scheme': 'http'
+        }, {
+            'port': http_public_port,
+            'scheme': 'http'
+        }, {
             'port': https_port,
             'scheme': 'https',
             'sslcert': True
@@ -38,6 +53,12 @@ class WPTServe(server_base.ServerBase):
             'scheme': 'https',
             'sslcert': True
         }, {
+            'port': https_private_port,
+            'scheme': 'https'
+        }, {
+            'port': https_public_port,
+            'scheme': 'https'
+        }, {
             'port': h2_port,
             'scheme': 'https',
             'sslcert': True
@@ -90,6 +111,8 @@ class WPTServe(server_base.ServerBase):
 
         self._error_log_path = self._filesystem.join(output_dir,
                                                      'wptserve_stderr.txt')
+        self._output_log_path = self._filesystem.join(output_dir,
+                                                      'wptserve_stdout.txt')
 
         expiration_date = datetime.date(2025, 1, 4)
         if datetime.date.today() > expiration_date - datetime.timedelta(30):
@@ -118,6 +141,10 @@ class WPTServe(server_base.ServerBase):
         # will try to delete the log file, which causes deadlocks on Windows.
         self._stderr = fs.open_text_file_for_writing(self._error_log_path)
 
+        # The pywebsocket process started by wptserve logs to stdout. This can
+        # also cause deadlock, and so should also be redirected to a file.
+        self._stdout = fs.open_text_file_for_writing(self._output_log_path)
+
     def _stop_running_server(self):
         if not self._wait_for_action(self._check_and_kill):
             # This is mostly for POSIX systems. We send SIGINT in