Chromium changes: https://chromium.googlesource.com/chromium/src/+/94e940f0ad7bd5d37452ee71ab06fe87d675afb2 Use java.util.function.Supplier rather than Chrome's copy of it. This is 99% sed + git cl format. The 1% was a couple shims to not break internal builds. See PS1->PS5 for them. Bug: 440309602 Change-Id: I9ff8438583286b238505c4f63062279c7b24b254 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6897327 Reviewed-by: Henrique Nakashima <hnakashima@chromium.org> Commit-Queue: Andrew Grieve <agrieve@chromium.org> Owners-Override: Andrew Grieve <agrieve@chromium.org> Cr-Commit-Position: refs/heads/main@{#1507988}