BASELINE: Update Chromium to 91.0.4472.160

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

2 files changed, 13 insertions, 6 deletions

diff --git a/chromium/third_party/blink/tools/blinkpy/web_tests/port/base.py b/chromium/third_party/blink/tools/blinkpy/web_tests/port/base.py
index 2cc0a105a9a..3aa95298a35 100644
--- a/chromium/third_party/blink/tools/blinkpy/web_tests/port/base.py
+++ b/chromium/third_party/blink/tools/blinkpy/web_tests/port/base.py
@@ -40,6 +40,7 @@ import re
 import sys
 import tempfile
 
+import six
 from six.moves import zip_longest
 
 from blinkpy.common import exit_codes
@@ -418,7 +419,7 @@ class Port(object):
 
     def default_max_locked_shards(self):
         """Returns the number of "locked" shards to run in parallel (like the http tests)."""
-        max_locked_shards = int(self.default_child_processes()) / 4
+        max_locked_shards = int(self.default_child_processes()) // 4
         if not max_locked_shards:
             return 1
         return max_locked_shards
@@ -437,7 +438,8 @@ class Port(object):
     def baseline_search_path(self):
         return (self.get_option('additional_platform_directory', []) +
                 self._flag_specific_baseline_search_path() +
-                self._compare_baseline() + self.default_baseline_search_path())
+                self._compare_baseline() +
+                list(self.default_baseline_search_path()))
 
     def default_baseline_search_path(self):
         """Returns a list of absolute paths to directories to search under for baselines.
@@ -842,7 +844,10 @@ class Port(object):
         baseline_path = self.expected_filename(test_name, '.txt')
         if not self._filesystem.exists(baseline_path):
             return None
-        text = self._filesystem.read_binary_file(baseline_path)
+        if six.PY2:
+            text = self._filesystem.read_binary_file(baseline_path)
+        else:
+            text = self._filesystem.read_text_file(baseline_path)
         return text.replace('\r\n', '\n')
 
     def reference_files(self, test_name):
@@ -1332,7 +1337,8 @@ class Port(object):
         return self.results_directory()
 
     def inspector_build_directory(self):
-        return self._build_path('resources', 'inspector')
+        return self._build_path('gen', 'third_party', 'devtools-frontend',
+                                'src', 'front_end')
 
     def generated_sources_directory(self):
         return self._build_path('gen')
diff --git a/chromium/third_party/blink/tools/blinkpy/web_tests/port/fuchsia.py b/chromium/third_party/blink/tools/blinkpy/web_tests/port/fuchsia.py
index df86b9099e3..94c91dbea5e 100644
--- a/chromium/third_party/blink/tools/blinkpy/web_tests/port/fuchsia.py
+++ b/chromium/third_party/blink/tools/blinkpy/web_tests/port/fuchsia.py
@@ -91,8 +91,9 @@ FONTS_DEVICE_PATH = '/system/fonts'
 # Number of CPU cores in qemu.
 CPU_CORES = 4
 
-# Number of content_shell instances to run in parallel. 1 per CPU core.
-MAX_WORKERS = CPU_CORES
+# Number of content_shell instances to run in parallel.
+# Allow for two CPU cores per instance.
+MAX_WORKERS = CPU_CORES / 2
 
 PROCESS_START_TIMEOUT = 20