BASELINE: Update Chromium to 96.0.4664.181

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

2 files changed, 15 insertions, 18 deletions

diff --git a/chromium/infra/config/generators/cq-builders-md.star b/chromium/infra/config/generators/cq-builders-md.star
index d42ab444242..281f14f51bc 100644
--- a/chromium/infra/config/generators/cq-builders-md.star
+++ b/chromium/infra/config/generators/cq-builders-md.star
@@ -24,7 +24,7 @@ using common assumptions about how builders are configured.
 
 _REQUIRED_HEADER = """\
 These builders must pass before a CL may land that affects files outside of
-//infra/config.
+//docs and //infra/config.
 """
 
 _OPTIONAL_HEADER = """\
@@ -110,12 +110,8 @@ def _group_builders_by_section(builders):
         optional = optional,
     )
 
-def _codesearch_query(*atoms, package = None):
+def _codesearch_query(*atoms):
     query = ["https://cs.chromium.org/search?q="]
-    if package != None:
-        query.append("package:%5E")  # %5E -> encoded ^
-        query.append(package)
-        query.append("$")
     for atom in atoms:
         query.append("+")
         query.append(atom)
@@ -128,7 +124,7 @@ def _get_regex_line_details(regex):
     if regex.endswith(".+"):
         regex = regex[:-len(".+")]
 
-    url = _codesearch_query("file:" + regex, package = "chromium")
+    url = _codesearch_query("file:" + regex)
 
     # If the regex doesn't have any interesting characters that might be part of a
     # regex, assume the regex is targeting a single path and direct link to it
@@ -162,18 +158,23 @@ def _generate_cq_builders_md(ctx):
 
         for b in builders:
             name = b.name.rsplit("/", 1)[-1]
+
+            # Some builders share a common prefix (android-marshmallow-x86-rel
+            # and android-marshmallow-x86-rel-non-cq for example). The quotes
+            # below ensure codesearch links find the exact builder name, rather
+            # than everything with a common prefix. Two sets of quotes are
+            # needed because the first set is interpreted by codesearch.
+            quoted_name = "\"\"{name}\"\"".format(name = name)
             lines.append((
                 "* [{name}]({try_builder_view}/{name}) " +
-                "([definition]({definition_query}+{name})) " +
-                "([matching builders]({trybot_query}+{name}))"
+                "([definition]({definition_query}+{quoted_name})) " +
+                "([matching builders]({trybot_query}+{quoted_name}))"
             ).format(
                 name = name,
+                quoted_name = quoted_name,
                 try_builder_view = _TRY_BUILDER_VIEW_URL,
                 definition_query = _codesearch_query(
-                    "file:/cq.star$",
-                    "-file:/beta/",
-                    "-file:/stable/",
-                    package = "chromium",
+                    "file:/try.star$",
                 ),
                 trybot_query = _codesearch_query("file:trybots.py"),
             ))
diff --git a/chromium/infra/config/generators/scheduler-noop-jobs.star b/chromium/infra/config/generators/scheduler-noop-jobs.star
index 992bef4a285..4f162d796b8 100644
--- a/chromium/infra/config/generators/scheduler-noop-jobs.star
+++ b/chromium/infra/config/generators/scheduler-noop-jobs.star
@@ -23,15 +23,11 @@ _NON_BRANCHED_TESTERS = {
     # the branches
     "mac-osxbeta-rel": branches.DESKTOP_EXTENDED_STABLE_MILESTONE,
 
-    # This tester is also triggered by 'Mac Builder', but we don't have enough
-    # capacity on Mac 11 to run this on the branches yet.
-    # TODO(crbug.com/1206401): Restore this when we do have capacity.
-    "Mac11 Tests": branches.DESKTOP_EXTENDED_STABLE_MILESTONE,
-
     # This tester is triggered by 'Win x64 Builder', but it is an FYI builder
     # and not mirrored by any branched try builders, so we do not need to run it
     # on the branches
     "Win10 Tests x64 20h2": branches.STANDARD_MILESTONE,
+    "Win11 Tests x64": branches.DESKTOP_EXTENDED_STABLE_MILESTONE,
 
     # These Android testers are triggered by 'Android arm Builder (dbg)', but we
     # don't have sufficient capacity of devices with older Android versions, so